API updates
Merge branch 'firstController' of https://github.com/sunderhaus/Citizen into firstController

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/officials-list.js