Merge branch 'master' into refactor-alias-init
initialization is now django-admin function instead of on save
added django-admin function for alias initialization
merge refactor branch into master