Modified git ignore
Merge branch 'master' of https://github.com/cmusv-sc/Practicum2014-Ericsson-Media
Fixed bugs related to DateFormat, static variable