Update 2 18 Juli 2014

Fixes for ContentManager file