add trading
Merge branch 'master' of https://github.com/Maalejm/SEBA

Conflicts:
	SlifeWebSite/app/views/mainLayout.html
	SlifeWebSite/eclipse/classes/controllers/Ads.class
	SlifeWebSite/eclipse/classes/controllers/Application.class
	SlifeWebSite/eclipse/classes/controllers/RentOffers.class
	SlifeWebSite/eclipse/classes/models/Ad.class
	SlifeWebSite/eclipse/classes/models/SaleOffer.class
	SlifeWebSite/tmp/bytecode/DEV/_app_views_Ads_index.html
	SlifeWebSite/tmp/bytecode/DEV/_app_views_Ads_newAd.html
	SlifeWebSite/tmp/bytecode/DEV/_app_views_Ads_viewAd.html
	SlifeWebSite/tmp/bytecode/DEV/_app_views_Application_index.html
	SlifeWebSite/tmp/bytecode/DEV/_app_views_mainLayout.html
	SlifeWebSite/tmp/bytecode/DEV/controllers.Ads
	SlifeWebSite/tmp/bytecode/DEV/controllers.Application
	SlifeWebSite/tmp/bytecode/DEV/controllers.RentOffers
	SlifeWebSite/tmp/bytecode/DEV/models.Ad
	SlifeWebSite/tmp/bytecode/DEV/models.SaleOffer
	SlifeWebSite/tmp/classes/controllers/Ads.class
	SlifeWebSite/tmp/classes/controllers/RentOffers.class