commit to pull
Merge branch 'master' of https://github.com/TimLeytens/GF14

Conflicts:
	GF14/GFAboutViewController.m