initial dev
fixed templates
Merge branch 'master' of github.com:vince-doggyloot/dodger into dev
fixed IM migration issue