working cyberagent
Merge commit '0ccf2675a3a28c6d2c2e8074ce87b13c109d1986'

Conflicts:
	config.xml
	css/gallery.css
	index.html
	js/app.js
	js/dynamic.js
	js/ios.js
	js/main.js
	js/photos.js
	js/propertylisting.js
	js/syncdata.js
	properties.html
	propertydashboard.html
	settings.html