location ajax
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	config/initializers/carrierwave.rb