Roll back code 2014-11-6 By MACZ
Roll back 2014-11-6 By MACZ
Merge branch 'master' of https://github.com/newmcz/ETMS

Conflicts:
	ETMS_WEB/Views/Shared/_LayoutNew.cshtml