App: Proto v3 Clean Up
Merge branch 'master' of https://github.com/Steckler/ScentLane

Conflicts:
	App/ScentLane/ScentLane.xcodeproj/project.pbxproj

App/ScentLane/ScentLane.xcodeproj/project.xcworkspace/xcuserdata/lukaswi
nkler.xcuserdatad/UserInterfaceState.xcuserstate