Fix to issues mentioned in pull request comments
Fix to code style
Merge remote-tracking branch 'origin/dev-cv' into dev-cv

Conflicts:
	WearScript/src/main/assets/init.js
	WearScript/src/main/java/com/dappervision/wearscript/WearScript.java