Implemented master pages
Merged conflicts
Merge branch 'master' of github.com:azend/SQ2-EMSPSS

Conflicts:
	EMS PSS/EMS PSS/AdminPage.aspx
	EMS PSS/EMS PSS/CreateEmployee.aspx
	EMS PSS/EMS PSS/CreateEmployee.aspx.cs
	EMS PSS/EMS PSS/GeneralUserPage.aspx
Merge branch 'master' of github.com:azend/SQ2-EMSPSS