Moving files that were committed to the wrong branch back into master
Merge branch 'master' into spring2015