pas important
Merge branch 'master' of https://github.com/MANHIGA/www.gangauthority.com

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/MANHIGA/www.gangauthority.com

Conflicts:
	nbproject/private/private.xml