Merge branch 'master' of https://github.com/FS-CodingNight/capapp

Conflicts:
	dist/app.min.js
	www/app.min.js