[#ADMCON-26]
Merge branch 'master' of https://github.com/mxhero/admin-console
[#ADMCON-26:removed Thumbs.db added to gitignore]