Merge branch 'hotfix-1.0.1'
Merge branch 'release-1.1.0'
Merge branch 'hotfix-1.1.1'
Merge branch 'hotfix-1.1.1'
Merge branch 'hotfix-1.1.1'
Merge branch 'hotfix-1.1.2'
fixed path issue in create_doors.php; lock-db now lives in /usr/share/webapps
Merge branch 'hotfix-1.1.3' into dev