login
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin.git into
HEAD

Conflicts:
	MasterCoin/src/main/resources/META-INF/persistence.xml
	MasterCoin/src/main/webapp/WEB-INF/templates/header.xhtml