Before Merging
before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	QNLWebsite/build/classes/com/qnl/facade/AttachmentFacade.class
	QNLWebsite/build/classes/com/qnl/facade/CustomUrlFacade.class
	QNLWebsite/build/classes/com/qnl/facade/DbaseNCollectFacade.class
	QNLWebsite/build/classes/com/qnl/facade/IUserInteractionFacade.class
	QNLWebsite/build/classes/com/qnl/facade/LibMenuFacade.class
	QNLWebsite/build/classes/com/qnl/facade/LibPageFacade.class
	QNLWebsite/build/classes/com/qnl/facade/LibRegistrationFacade$1.class
	QNLWebsite/build/classes/com/qnl/facade/LibRegistrationFacade$2.class
	QNLWebsite/build/classes/com/qnl/facade/LibRegistrationFacade$3.class
	QNLWebsite/build/classes/com/qnl/facade/LibRegistrationFacade$4.class
	QNLWebsite/build/classes/com/qnl/facade/LibRegistrationFacade.class
	QNLWebsite/build/classes/com/qnl/facade/LibTemplateFacade.class
	QNLWebsite/build/classes/com/qnl/facade/NewsCategoryFacade.class
	QNLWebsite/build/classes/com/qnl/facade/NewsItemFacade.class
	QNLWebsite/build/classes/com/qnl/facade/ResInstituteFacade.class
	QNLWebsite/build/classes/com/qnl/facade/RoleFacade.class
	QNLWebsite/build/classes/com/qnl/facade/SubscribeFacade.class
	QNLWebsite/build/classes/com/qnl/facade/UserFacade.class
	QNLWebsite/build/classes/com/qnl/services/ServiceRequest.class
	QNLWebsite/build/classes/com/qnl/services/TimeService.class
	QNLWebsite/build/classes/com/qnl/services/WeatherService.class
	QNLWebsite/build/classes/com/test/testMe.class
	QNLWebsite/src/com/qnl/core/LibPage.java