Merge branch 'master' of https://github.com/apo-j/appforces-front

Conflicts:
	app/scripts/directives/components.js
Merge branch 'master' of https://github.com/apo-j/appforces-front

Conflicts:
	app/scripts/directives/components.js