Merge branch 'andreas' of github.com:hellozimi/feels into simon

Conflicts:
	feels/feels/Camera stuff/CameraViewController.m
	feels/feels/en.lproj/MainStoryboard.storyboard
forced to am/pm and en_us_posix
added last minute signing
Merge remote-tracking branch 'origin/simon' into andreas

Conflicts:
	feels/feels/Camera stuff/CameraViewController.m
	feels/feels/en.lproj/MainStoryboard.storyboard