Conflict Test Emre
Merge branch 'master' of https://github.com/tirnovali/Wissen

Conflicts:
	wissen_2.2.1/wissen_2.2.1/MainViewController.m