.
Merge branch 'master' of https://github.com/disorder81/army-builder

Conflicts:
	public/js/app.js
	public/js/controllers.js
	public/partials/army-detail.html
	public/partials/army.html
	public/partials/main.html
ui-router