MERGE

Signed-off-by: will <will@casa-P17G.(none)>
Merge branch 'master' of https://github.com/willguitaradmfar/arabeths.com.br

Conflicts:
	gerarAPI/Post.sh
	gerarAPI/geraApi.js
	public/javascripts/app/controllers.js
	public/javascripts/app/routes.js
	public/stylesheets/app/template.css