Restore
Merge branch 'master' of github.com:HeMet/test-app

Conflicts:
	config.xml
	css/index.css
	index.html
	js/PhotoViewController.js
	js/index.js