Copied changes from openbas repository; all future work on meteor version will be done here
Merged previous work with Michael's UI changes
Fixed some bugs, ported changes