fixes and user page changes
Merge branch 'master' of https://github.com/minghz/civso
merging
Conflicts:
	app/views/layouts/_navigation.html.erb