Skift til android video iPhone / iPad
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/controllers.js
Trix merge version 2
Merge remote-tracking branch 'DR/master'
Trix merge version 2