Merge origin/master

Conflicts:
	plugins/android.json
	www/js/controllers.js