.
Merge branch 'master' of github.com:windwhinny/windapp

Conflicts:
	0/app/imageBrucket.js
Merge branch 'master' of github.com:windwhinny/windapp
add build.js