button was added
Label was added
Merge branch 'master' into newFeature1

Conflicts:
	GitTest/en.lproj/ViewController.xib