integrating code
Merge branch 'master' of https://github.com/julianweisbord/fhsapp_v2

Conflicts:
	lib/config.php
	login.php
updated merge