integrates api structure
commit
fuck scaffolds
fuck scaffolds
db fix
Merge branch 'master' of github.com:vanvleit/papertrails
merge