Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'

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