Fixing CORS on API
Fixing build
Merge branch 'master' of https://github.com/lucasloliveira/beauty

Conflicts:
	beauty-client/app/styles/main.css
delete main.css