updating to hotfix 1.5.2
Merge branch 'develop' into hotfix/1.5.2

* develop:
  updating flash_hls_player version to 1.0.7
  Starting 1.6.0

Conflicts:
	bower.json
	package.json
Merge branch 'hotfix/1.5.2' into develop
fixed version number