1.2 - Starting feature2
1.2.0 - end feature2
Merge branch 'feature2'

Conflicts:
	Test2/Test2/ViewController.m
merge
merge cleaning