changed app.js
x
Merge branch 'pinwall2.5' of https://github.com/xavieryuan/DesignEngine_Web into pinwall2.5

Conflicts:
	js/src/app.js