Match variable name in ubuntu init. fix #2149
Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop
Set order changes on each run. fix #2148
not in
Merge remote-tracking branch 'upstream/develop' into develop
Only show login when both username and password are filled in. fix #2157
Gilles de la Tourette
Merge remote-tracking branch 'upstream/develop' into develop