#220 merged hotfix branch
added classes to .gitignore
Merge branch 'develop' of https://github.com/scenarioo/scenarioo into develop

Conflicts:
	scenarioo-client/app/index.html
	scenarioo-client/app/views/scenario.html