Merge pull request #8 from transmart/london_hackaton

London hackaton
Merge pull request #9 from transmart/master

update
Fix js conflicts in access control by group of the admin page
Merge pull request #80 from sh107/london_hackaton

Fix js conflicts in access control by group of the admin page