work on profile page and view
Merge branch 'master' into john

Conflicts:
	db/development.sqlite3
	log/development.log
Merge pull request #44 from woolly-bear-caterpillars-2014/john

John