2
cp1
cp2
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/app/viewModels/offerSite.js
	mobile/app/views/about.html
	mobile/app/views/sitesList.html
	mobile/app/views/sitesMap.html
	mobile/app/views/userPanel.html
	mobile/app/views/userWorkDetail.html
	mobile/css/base.css
	mobile/icon.png
	mobile/index.html
	mobile/splash.png