update code / remove unnecessary cols & rows
Merge remote-tracking branch 'origin/dev'

Conflicts:
	app/loader.js