UPDATE
dsd
update
Merge branch 'master' of https://github.com/Maalejm/SEBA

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/c1/b0a21164dde80012128180c340e512c1
	SlifeWebSite/app/views/mainLayout.html
	SlifeWebSite/eclipse/classes/controllers/Application.class
	SlifeWebSite/eclipse/classes/controllers/Questions.class
	SlifeWebSite/eclipse/classes/controllers/casino/Registration.class
	SlifeWebSite/tmp/bytecode/DEV/_app_views_Ads_index.html
	SlifeWebSite/tmp/bytecode/DEV/_app_views_Application_index.html
	SlifeWebSite/tmp/bytecode/DEV/_app_views_Questions_index.html
	SlifeWebSite/tmp/bytecode/DEV/_app_views_mainLayout.html
	SlifeWebSite/tmp/bytecode/DEV/controllers.Application
	SlifeWebSite/tmp/bytecode/DEV/controllers.Questions
	SlifeWebSite/tmp/bytecode/DEV/controllers.casino.Registration
	SlifeWebSite/tmp/bytecode/DEV/models.Question
	SlifeWebSite/tmp/classes/controllers/Application.class
	SlifeWebSite/tmp/classes/controllers/Questions.class
	SlifeWebSite/tmp/classes/controllers/casino/Registration.class