Merge branch 'master' into JonsBranch
Merge branch 'master' into JonsBranch
Merge branch 'davidsBranch' into JonsBranch

Conflicts:
	RatRace/RRMarketViewController.m
Image on alerts
Merge branch 'master' into JonsBranch

Conflicts:
	RatRace/RRMarketViewController.m
Final sync
Merge branch 'JonsBranch'
Event engine
Merge branch 'JonsBranch'
Merge branch 'master' into davidsBranch