renewed branch
Merge branch 'Joe-Branch' of https://github.com/Cmadmin/totalhr.com into Joe-Branch

Conflicts:
	totalhr.v11.suo
Restructured Tests
Restructuring for unit tests