fix for php5.4 strict standards in admin panel modules
Merge branch 'tester' into dev