pour résoudre conflit mineur
Merge branch 'master' of https://github.com/thomasNDS/SmartCampus2014

Conflicts:
	admin_app/SmartCampusAdminApp/nbproject/private/private.xml