commit
gopro hero
Merge branch 'master' of https://github.com/KonradIT/HeroProApp

Conflicts:
	HTML5App/index.html