Added initial tabs layout
Merge branch 'master' into dashboard

Conflicts:
	public/modules/core/css/dashboard.css
Merge pull request #7 from cheung31/dashboard

Added initial tabs layout