Merge pull request #1 from witlessbird/api_v2

changes to config template and template combination api
a few fixes for config_templates/template_combinations
Merge branch 'api_v2' of git://github.com/isratrade/foreman into api_v2