Fix coding style and update README
Merge branch 'development' into michael and fix conflicts.

Conflicts:
	demo.html
	js/mawbutton.js
Merge pull request #14 from yuhua-chen/michael

Fix coding style and update README