Merge pull request #26 from codedthemes/stage-6.0.0 · codedthemes/mantis-free-angular-admin-template@300fbe5