Add aux database to project
Merge branch 'master' of https://github.com/opfo/app

Conflicts:
	Code Stream.xcodeproj/project.pbxproj