Pushing new changes
Updated
Merge branch 'master' of training:philips-august-2014/prep into pull_vijujo_20140811104344409