Fix html escape bug at Themes
Merge pull request #198 from mizoR/master

Fix html escape bug at Themes
sitemap.xml
Merge pull request #199 from kmamiya/add_sitemap.xml

Add sitemap.xml.
Support CoffeeScript

Fix spec for coffee script support
Merge branch 'master' into portalshit
Merge branch 'support-coffee-script' of github.com:morygonzalez/lokka into portalshit

Conflicts:
	Gemfile
	Gemfile.lock