Merge branch 'master' of https://github.com/nickveenhof/drupalcamp2014

# By boris doesborg
# Via boris doesborg
* 'master' of https://github.com/nickveenhof/drupalcamp2014:
  remove content features
Merge branch 'master' of https://github.com/nickveenhof/drupalcamp2014

* 'master' of https://github.com/nickveenhof/drupalcamp2014: