work work
Merge branch 'master' of https://github.com/KernelCorp/yufu

Conflicts:
	app/assets/javascripts/ember/routes/profiles_edit_route.js.coffee
Merge branch 'master' of https://github.com/KernelCorp/yufu

Conflicts:
	app/assets/javascripts/ember/routes/profiles_edit_route.js.coffee
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/ember/templates/_navigation.hbs