Merge branch 'master' into Jason-Branch
removed line with test text
Upgrade Password Secuirty

Introduced Salt and MD5 security functions into user class.
Added Admin Update script function to update current stored passwords
to new format.
Updated logincheck function to take into account the MD5 login for
verification.
Updated Reset Password to new format
Updated send new  password to new format.
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