tolga
Merge branch 'development' of
https://github.com/PCI-SM-SWE/rotund-pony.git into development

Conflicts:
	public/javascripts/angular.js