edit cmsdata 15072014
Merge branch 'develop' of github.com:christian6/cmsdata into develop