Merge pull request #159 from Eyas/secure-auth

Secure Authentication in Master
fix UnicodeEncodeError
fix instructions: password reminder -> password reset instructions
Merge pull request #131 from jenkliu/sort-contents

Add ability to sort contents by date published, last seen, and alphabetically
fix typo
Remove all traces of 'page last seen' tracking
changes for compatibility w/ ubuntu 14.04 and django 1.6
rename apache conf file
add new required apache>=2.4 directive
Merge branch 'master' into dev

Conflicts:
	apps/base/models.py
	apps/pages/views.py