piiii
Merge branch 'master' into piii

Conflicts:
	gyropad/gyropad/Classes/Controllers/GPSceneViewController.m
Merge pull request #25 from repokoa/piii

piiii