final
Merge https://bitbucket.org/jordanlapp/admin
added dot files