Boot Strap Page Layout Updates
Merge branch 'WJP-Branch'
Work Space update
Merge branch 'Jason-Branch'

Conflicts:
	Classes/classes.php
	Classes/templateclass.php
	Classes/userclass.php
	portal.sublime-workspace
jason branch merge into master
portal-sublime change
Merge branch 'master' into Jason-Branch

Conflicts:
	portal.sublime-workspace
Mandrill Changes