Custom User Registration/Sign In - requires DB update
Custom User Registration/Sign In - requires DB update
Custom User Registration/Sign In - requires DB update
Merge branch 'customLogin'

Conflicts:
	index.php
	lib/siteInit.php
	templates/header.php
	viewSubs.php