MapCommit
googlemap
Merge branch 'master' of https://github.com/hgupta2/Winston-Salem-Greenways

Conflicts:
	WinstonSalemGreenways/bin/WinstonSalemGreenways.apk
	WinstonSalemGreenways/bin/classes.dex
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/Greenway.class
	WinstonSalemGreenways/bin/resources.ap_
	WinstonSalemGreenways/src/com/winstonsalem/greenways/Greenway.java

Signed-off-by: Priyanka Jalisatgi <priyankagj@gmail.com>