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

Conflicts:
	Gemfile.lock
	server.rb
Merge branch 'master' of https://github.com/disorder81/army-builder
controllers a modulos, formulario, POST REST
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/app.js
	public/js/controllers.js
	public/partials/army-detail.html
	public/partials/unit-creation.html