removed unused packages
Merge branch 'jeremy-refactor-branch' of https://github.com/cmusv-sc/Practicum2014-Ericsson-Media into jeremy-refactor-branch