Merge branch 'hotfix-1.1.1' into dev
Merge branch 'hotfix-1.1.1'
bumb version number to 1.1.1
Merge branch 'hotfix-1.1.1'
Merge branch 'hotfix-1.1.1' into dev
fixed path names in login.php; bumped verison to 1.1.2
Merge branch 'hotfix-1.1.2'