ajaxy
Merge branch 'mj6'

Conflicts:
	app/assets/stylesheets/style.scss