0826 update
Merge remote-tracking branch 'origin/master'1

Conflicts:
	js/main.js
1
Merge branch 'master' of https://github.com/vovina/PogressBar