Merge branch 'dev'

Conflicts:
	js/main.js
Merge branch 'dev'