UI work initial commit
conflict resolution
connects to the server and gathers data to display as a force directed graph
fdg works by gathering data from server
current status
Merge remote-tracking branch 'origin/master' into UI-work

Conflicts:
	Gemfile.lock
bugs 1 and 2 resolved. Working on displaying information.
about popups
stable state
Merge branch 'UI-work'

Conflicts:
	Gemfile.lock
Merge branch 'UI-work'

Conflicts:
	Gemfile.lock
Merge branch 'UI-work'

Conflicts:
	Gemfile.lock
working version
Merge branch 'UI-work'
items display
with maps
Merge branch 'UI-work'
Fixed active admin
merged to master
separated admin from front-end