Merge branch 'master' into macbook-branch
switched db tables
changed .ignore

changed .ignore so that .zfproject.xml is tracked
Merge pull request #146 from californiavol/macbook-branch

Macbook branch