getting active tabs to work
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/jaruesink/greek-app