Added inline selectors to base controller
Merge branch 'master' of https://github.com/berrberr/gshotkeys

Conflicts:
	controllers/BaseController.js