Add Screen 3
add text
add f3
add f4
test
Merge branch 'hotfix/fix1' into develop

Conflicts:
	DemoGit/DemoGit.xcodeproj/project.xcworkspace/xcuserdata/socialaffect.xcuserdatad/UserInterfaceState.xcuserstate
	DemoGit/DemoGit/ATHScreen2ViewController.xib
	DemoGit/DemoGit/ATHViewController.m
Merge branch 'release/1.3'