tmp olav
tmp olav
Merge branch 'thyal-parser' of git://github.com/lafka/tm-web into thyal-parser
fixed boxes, picture and text
Fix active state in navigation
Merge branch 'thyal-parser' of git://github.com/lafka/tm-web into thyal-parser

Conflicts:
	app/main.jst
Fix error in home link's .active state