Added preferences section to settings
Merge branch 'master' of https://github.com/HioLeong/hexes.co

Conflicts:
	public/partials/viewUserProfile.html