Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez

Conflicts:
	requirements.txt
Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez
Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez
Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez