Squashed 'Base/Content/' changes from 0d71e05..3124b84

3124b84 removed node modules from source control
1ca8a3f some weird stuff going on here!
eef42bc gruntfile aanpassing
f435ba7 grunt file aanpassing

git-subtree-dir: Base/Content
git-subtree-split: 3124b84f585e6667ba7808b0bcf48c3598a244d8
Merge commit '904092d2f9b6b4ba0c5e0886c2330ac6d2795414'

Conflicts:
	Base/Content/bower.json