update
Merge branch 'master' of https://github.com/SidneyAllen/hollagram-html5-requirejs

Conflicts:
	js/build.js