Merge branch 'whiteboardmonk-patch-1'
Documented the possibility to change instance type for CF tpl #220
Made it possible to configure the instance type #220
Tried to fix rst issue for the global section
Merge branch 'hotfix/2014-11-13' into develop