merged posts/*.haml and pages/*.haml to entries/*.haml
fixed typo
Merge pull request #106 from mururu/master

fixed typo
change R18n method name t to rt
change R18n method name l to rl
added padrino-helpers
disabled logging because log message display twice
removed sinatra-content_for because it already have sinatra-contrib
added some specs
Merge branch 'padrino-helper'

Conflicts:
	lib/lokka.rb
	lib/lokka/app.rb
removed r18n
refactor entry
added japanese default time format
fixed error on ruby1.8.7 because YAML::ENGINE is uninitialized constant
fixed spec failed on 1.8.7. because KCODE isn\'t set
fixed quotation bug
supported Markdown(Kramdown) and Textile(RedCloth).
added markup.rb
removed some helpers because it contained in padrino-helpers
on entry edit form, use plain textarea when markup is Markdown or Textile