change version
device check.
Merge branch 'develop'

Conflicts:
	www/config.xml
	www/js/page-player.js