AA
Merge branch 'master' of github.com:davehubler/locke

Conflicts:
	app/controllers/application_controller.rb
Updates
Merge branch 'master' of github.com:davehubler/locke