Merge with master
Merge branch 'master' of https://github.com/cmusv-sc/Practicum2014-Ericsson-Media.git