morning
moved login partials into unless statement
morning
applicationhtml page
Merge branch 'master' into jake

Conflicts:
	app/assets/javascripts/application.js