Merge branch 'DEV'
New grunt setup.
Merge branch 'master' into DEV
Override constructor property of child constructor.
Added test for constructor prop.