Fixed deprecation warning
Fixes #127 - can edit profile now
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/router.js.coffee