Merge pull request #3 from aananighian-pics/master

Some small UI Tweaks
update data gen
Added additional data
Merge branch 'master' of https://github.com/rubiconvale/Hackathon_Oct2014

Conflicts:
	Mongo-Hack/src/test/java/com/service/TestLocationMapService.java