Merge branch 'master_fixes' into 'master'

Dominik

2014-02-26 5a2985f97fb4ef24085722957b3a5e53bfa38949

1
ALTER TABLE `client` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';