Merge branch 'master' of https://github.com/HorizontDimension/n2b

Conflicts:
	form.n2b.pt/client/app/css/custom.css
	form.n2b.pt/client/app/index.html
	form.n2b.pt/client/app/partials/transfer.html