Merge branch 'master' into ltolias
initial models commit, new people app
Merge branch 'ltolias'
initial models