Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/apps/main/main.js