small changes view controller
Merge branch 'master' of https://github.com/ivan-brugere/csinder_new

Conflicts:
	CSinder/ViewController.m
Merge branch 'master' of https://github.com/ivan-brugere/csinder_new