* Initial changes for otp
Merge branch 'otp'

Conflicts:
	hooks/after_platform_add/010_install_plugins.js
	www/js/controllers.js