Merge branch 'master' of https://github.com/lordareonz/NightFever

Conflicts:
	NightFever/Classes/MapViewController.m
ASA