Made various changes, updated documentation
Merge branch 'master' of github.com:snowballrandom/sjf-v1.2

Conflicts:
	application/models/auth_model.php