commititn
Merge branch 'master' of https://github.com/nkg-ros/roshack

Conflicts:
	static/js/app.js