Merge remote-tracking branch 'origin/tako' into ika

Conflicts:
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb
	db/schema.rb