Merge
Merge branch 'master' of https://github.com/leoru/freelansim-iOS

Conflicts:
	freelansim.xcworkspace/xcuserdata/ars.xcuserdatad/UserInterfaceState.xcuserstate