* Fixed conflicting files after: Merge branch 'HEAD' of git@github.com:Steffion/AdminEye.git.