Update gitignore
Merge branch 'develop' of github.com:gerald/crown_asia into develop
Fix for editing children