Merge branch 'master' into develop

CHANGES.txt

@@ -1,3 +1,6 @@
+0.2.1
+  * Fix of PyPI packaging
+
 0.2.0
   * Implement new rule syntax
   * Add time-aware / recurring achievements

MANIFEST.in

@@ -1 +1,3 @@
 include *.txt *.ini *.cfg *.rst *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.py README DUMMY LICENSE
+recursive-include gengine *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml README DUMMY app/alembic app/alembic/versions/*.py app/alembic/env.py
+recursive-include gengine_quickstart_template *.ini

README.md

@@ -1,13 +1,14 @@
 # gamification-engine
 [![Build Status](https://travis-ci.org/ActiDoo/gamification-engine.svg?branch=master)](https://travis-ci.org/ActiDoo/gamification-engine)
-[![Coverage Status](https://coveralls.io/repos/github/ActiDoo/gamification-engine/badge.svg?branch=develop)](https://coveralls.io/github/ActiDoo/gamification-engine?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/github/ActiDoo/gamification-engine/badge.svg?branch=master)](https://coveralls.io/github/ActiDoo/gamification-engine?branch=master)
 [![Requirements Status](https://requires.io/github/ActiDoo/gamification-engine/requirements.svg?branch=master)](https://requires.io/github/ActiDoo/gamification-engine/requirements/?branch=master)
-[![Heroku](https://heroku-badge.herokuapp.com/?app=gamification-engine&root=admin)](https://gamification-engine.herokuapp.com)
-[![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat)](https://readthedocs.org/projects/gamification-engine/?badge=latest)
+[![Heroku](https://heroku-badge.herokuapp.com/?app=gamification-engine&root=admin/)](https://gamification-engine.herokuapp.com)
+[![Documentation Status](https://img.shields.io/badge/docs-master-brightgreen.svg?style=flat)](https://readthedocs.org/projects/gamification-engine/?badge=master)
+[![Release](https://img.shields.io/github/release/ActiDoo/gamification-engine.svg?style=flat)](https://github.com/ActiDoo/gamification-engine/releases/latest)
 [![Latest Version](https://badge.fury.io/py/gamification-engine.svg)](https://pypi.python.org/pypi/gamification-engine/)
-[![Downloads](https://img.shields.io/pypi/dm/gamification-engine.svg)](https://pypi.python.org/pypi/gamification-engine/)
+[![PyPI](https://img.shields.io/pypi/pyversions/gamification-engine.svg)]()
 [![License](http://img.shields.io/:license-mit-green.svg)](https://pypi.python.org/pypi/gamification-engine/)
-
+<!--[![Downloads](https://img.shields.io/pypi/dm/gamification-engine.svg)](https://pypi.python.org/pypi/gamification-engine/)-->
 
 The Gamification-Engine (gengine) is an open source software (MIT) for integrating any kinds of gamification features into your product.
 

gengine/__init__.py

@@ -5,7 +5,7 @@
 from gengine.base.errors import APIError
 from gengine.base.settings import set_settings
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 import datetime