Committing
Merge branch 'master' of github:philips-august-2014/prep into 20140812150957649
Pushing new changes
Updated
Merge branch 'pull_vphilomin_20140812150957649'

Conflicts:
	source/prep.specs/MovieLibrarySpecs.cs