Database
Merge branch 'master' of https://github.com/BaobabLogic/BaobabLogic

Conflicts:
	db/schema.rb