Merge branch 'master' of github.com:Synesso/yogadiz

Conflicts:
	css/timetable.css
Merge branch 'master' of github.com:Synesso/yogadiz
Merge branch 'master' of github.com:Synesso/yogadiz

Conflicts:
	css/timetable.css