space optimization

Conflicts:
	hm2/js/app.js