...

git-tfs-id: [http://v-tfs01:8080/tfs/DefaultCollection]$/VivantioServiceDesk/_Temp/GitConnect/appone;C10889
Merge branch 'master' of https://github.com/andrew-telerik/appone

Conflicts:
	AppOne/cordova.android.js
	AppOne/cordova.ios.js
	AppOne/index.html
	AppOne/kendo/js/jquery.min.js
	AppOne/kendo/js/kendo.mobile.min.js
	AppOne/kendo/styles/kendo.mobile.all.min.css
	AppOne/scripts/app.js
	AppOne/scripts/location.js
	AppOne/scripts/login.js
	AppOne/scripts/weather.js
	AppOne/styles/main.css