Merge branch 'master' of https://github.com/Relife/Borkboon

Conflicts:
	Borkboon/en.lproj/MainStoryboard_iPhone.storyboard