.
Merge branch 'master' of https://github.com/zabady/FTR_Final_Version

Conflicts:
	Resources/iphone/alloy/controllers/phoneNumberWin.js
	Resources/iphone/alloy/controllers/privacyPicker.js
	Resources/iphone/alloy/controllers/smsWin.js
	Resources/iphone/alloy/controllers/userMainDetailsWin.js
	Resources/iphone/alloy/controllers/welcomeWin.js
	Resources/iphone/alloy/styles/phoneNumberWin.js
	Resources/iphone/alloy/styles/smsWin.js
	Resources/iphone/alloy/styles/userMainDetailsWin.js
	Resources/iphone/alloy/styles/welcomeWin.js