basic layout updated
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
basic layout updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/jsp/User/user.jsp
Merge branch 'master' of D:\User\Documents\KDG\2012 - 2013\Project\ProjectTeamF with conflicts.
basic layout updatedqsdf