flash
login to evernote
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/pages_controller.rb