merge test
Merge branch 'master' of https://github.com/reeedo/jolp2015

Conflicts:
	src/models/__init__.py
lo0cal merge test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/models/__init__.py