sync pc's
Merge branch 'master' of https://github.com/joaobrito/bernardo

Conflicts:
	css/style.css
	nbproject/private/private.properties
	nbproject/private/private.xml
	views/content.html