fixed overlapping

main div stond op 800px, de container met tiles erbij was langer dan
800px
Merge remote-tracking branch 'origin/Homescreen'
Some fixes and user session
session user and fixes
Merge branch 'master' of https://github.com/duytrann/HipperEnterpriseTeam4

Conflicts:
	HipperEnterprise V0.3/target/HipperEnterprise-1.0-SNAPSHOT.war
	HipperEnterprise V0.3/target/maven-archiver/pom.properties