update active admin
change gitignore
Merge branch 'master' of github.com:balticit/template