asd`
Merge branch 'master' of https://github.com/Dinesh497/PROVEIT-AJAX

Conflicts:
	AjaxAgendaApp/SwitchAndAddPlayersViewController.m
asd