start feature3
hotfix2
Merge branch 'feature3'

Conflicts:
	Test2/Test2/ViewController.m
merge cleaning