Stuff
Merge remote-tracking branch 'origin/simon' into andreas

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/en.lproj/MainStoryboard.storyboard
cool stuff ye
Camera stuff
stuff
New splash screen
Merge remote-tracking branch 'origin/simon' into andreas

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/en.lproj/MainStoryboard.storyboard
Merge remote-tracking branch 'origin/hannes' into andreas
Merge remote-tracking branch 'origin/hannes' into simon
Merge remote-tracking branch 'origin/andreas' into simon