for merge
Merge branch 'master' of https://github.com/ckristo/WAE-CM-SS2014-G1