pdf bug fixed 122214
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/cs/android/nycmetroassistance/View/MapActivity.java
Fixed bug