Move functionality to separate controllers and services where possible
Merge branch 'master' of https://github.com/johnwalley/risk-jargon-generator

Conflicts:
	app/js/services.js