Merging master into groups. Conflict in companyList.html (changed indention)
Moving group editing into directive and allowing tagging in the dropdown
Merge branch 'groups' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing