before pulling changes
Merge branch 'master' of https://github.com/maherhamoui/smartway.git

Conflicts:
	bin/.gitignore
	
ContactManagedBean was committed in faces-config.xml
Merge branch 'master' of https://github.com/maherhamoui/smartway.git

Conflicts:
	WebContent/WEB-INF/faces-config.xml
	bin/hibernate.cfg.xml

apache poi libs added to build.gradle