Merge of git repo on i7
Merge branch 'master' of https://github.com/roadev/IPOO_Alcancia

Conflicts:
	nbproject/private/private.xml
A lot of bug fixes