claims i deleted a bunch of dll files? no?
Merge remote-tracking branch 'origin/master'

Conflicts:
	CRTUmbraco/Controllers/FeedController.cs