Merge remote-tracking branch 'origin/andreas' into hannes
Stuffffff
stuff
fix
fix
Merge remote-tracking branch 'origin/simon' into andreas

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/Camera stuff/CameraViewController.m
Started adding points..
fix and trix
Merge remote-tracking branch 'origin/hannes' into andreas
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