First commit
fixed ReferenceError
Wrong method
Merge branch 'master' into gh-pages

Conflicts:
	js/controllers/android-ctrl.js