model init changes, temp img for summary general tab floor control clause
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/js/app-model.js
	common/views/level_content.htm
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/js/app-model.js
	common/views/level_content.htm