Merge branch 'master' into 'master'

Marius Cramer

2015-06-03 c3fab8f2cdf92d6b9d66202e3210cc01e5c53db5

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