Jarvis project and assets app started
Merge branch 'master' of https://github.com/stigster/jarvis

Initial merge of xub and github
Update .gitignore

Added .db and .old to ignore
Asset admin and model from mac
Merged edits on asset/admin and asset/model
Added person and actionplan apps