commit1
Merge remote-tracking branch 'origin/master' into sub

Conflicts:
	assets/js/hallo.js