:smile: The more i can do
Merge branch 'master' of github.com:RenderTeam/ateneo

Conflicts:
	public/js/app.min.js
	sections/_services/events.service.browser.js
	sections/events/index.js
LAst
Merge branch 'master' of github.com:RenderTeam/ateneo

Conflicts:
	public/js/app.min.js