fixing the display of galaxy in the admin panel
Adding a commented out galaxy-plugin and fixing TM-143.
+
special thanks to Florian Guitton for his help :p
Merge remote-tracking branch 'origin/london_hackaton' into london_hackaton