fixed tagging
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	js/angular_main.js
	main.pyc