Added branch config param
Added feature class
Merge branch 'master' into Feature#134
Merged with master and resolved config.php conflict
Merge branch 'Feature#134'