Latest changes
Merge remote branch 'origin/master'

Conflicts:
	src/js/main.js