Merge branch 'master' into develop

* master:
  Updated padding issue
Updated padding issue
Spacing for items on mobile & responsive fixes
Revert to trunk version
Merge branch 'develop' of https://github.com/zenduo/adapt-contrib-boxmenu into zenduo-develop

* 'develop' of https://github.com/zenduo/adapt-contrib-boxmenu:
  Revert to trunk version
  Spacing for items on mobile & responsive fixes
  Updated padding issue

Conflicts:
	less/boxmenu.less
Merge pull request #4 from adaptlearning/develop

Develop