just some check in

Conflicts:
	js/application.js
just some check in