Fixes the admin uri bug if the administration uri was changed
Makes the constant works since we are inside an single quoted string
Merge branches 'master' and 'develop'