Adapted stuff
Merge branch 'master' of https://github.com/MrFjellstad/retrospective

Conflicts:
	static/app/scripts/services/tickets.js