pogs team update typo
pogs team update typo
pogs team update typo
pogs team update typo
Merge branch 'master' into develop
added msg's, improved combat system, refracted some displays, plus improved speed of some api calls, added galaxy's to quadrants, fixed minimap updateing
working on faye update system
typo
asset compile
 and clean up
Fix issue with Time class
Add auto generated galaxy mosaics
Add auto generated galaxy mosaics
Add auto generated galaxy mosaics
Add auto generated galaxy mosaics
Add auto generated galaxy mosaics
add rss feed to news as a trial
add qr code to galaxy mosaic
add notifications for galaxy mosaic
add timeline for galaxy mosaic
add share button for galaxy mosaic page
add list of users to galaxy mosaic page
added galaxy mosaic job, not yet started
Merge branch 'master' into develop

Conflicts:
	Gemfile
	db/structure.sql
	lib/tasks/schedule_jobs.rake
Merge branch 'master' into develop

Conflicts:
	Gemfile
	db/structure.sql
	lib/tasks/schedule_jobs.rake