grid - subseries
Merge branch 'master' of https://github.com/dundich/sked

Conflicts:
	public/app/index.html
	public/app/js/controllers.js
	public/app/js/directives.js