.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/app/controller/Main.js
	web/app/controller/Main.js
	web/app/view/Viewport.js
.