Further problem-desc cleanup.
Merge branch 'htmlclean'
Merge pull request #126 from vexorian/htmlclean

Further problem-desc cleanup.
update styles, fix null pointer when depending on non-exist templates
2.0-RC release
Merge branch 'master' of https://github.com/shivawu/topcoder-greed

Conflicts:
	version
ref #127, grid fix. Further HTML cleanup and tweaks.
If api's timelimit is 840000, return 2000.
Merge branch 'gridfixhtmlclean' into HEAD

Conflicts:
	src/main/resources/template-defs.conf
	src/main/resources/templates/problem/dark.theme.css
	src/main/resources/templates/problem/default.css
	src/main/resources/templates/problem/desc.html.tmpl
	version
Merge branch 'fix840' into HEAD
Merge branch 'new_branch_name'