Merge branch 'convert_to_reseller' into 'master'

Marius Cramer

2014-08-14 c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7

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