:smile: Merge
Merge branch 'master' of github.com:RenderTeam/ateneo

Conflicts:
	sections/study_groups/administrate-study-group.controller.browser.js