point dev to prod.
no message
changed name.
Merge branch 'develop'

Conflicts:
	www/config.xml
no message
change version.
Merge branch 'develop'

Conflicts:
	www/config.xml
	www/js/page-player.js
Merge branch 'develop'

Conflicts:
	www/js/page-player.js
no message
no message
Merge branch 'develop'

Conflicts:
	www/config.xml
	www/js/app.js
	www/js/index.js
add search.