Merge branch 'release/0.1.1'
Merge branch 'release/0.1.2'
Merge branch 'release/0.1.3'
Merge branch 'release/0.1.4'
Merge branch 'release/0.1.5'
Merge branch 'release/0.1.6'
Merge branch 'master' of github.com:klen/Flask-Collect
Merge branch 'release/0.2.0'
Merge branch 'release/0.2.1'
Merge branch 'release/0.2.2'
Removes import from setup.py and conf.py

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>
Merge pull request #3 from jirikuncar/setup-py-fix

Removes import from setup.py and conf.py
Code cleanup
Update version
Merge branch 'release/0.2.3' into develop