Jfjlaros 2014

Merged Martijn Vermaat requested to merge jfjlaros_2014 into master

Merge request reports