updated .gitignore, people.tpl
Merge branch 'faham' of https://github.com/Faham/mycms into faham