Lots of Bugs squashed. Live site pushed.
Merge branch 'Adding-User-names'

Conflicts:
	application/config/config.php