test Snippet
Merge pull request #138 from is8r/master

テーマのデザインテロです！
change edit link condition
change edit link condition by id
change edit link condition by id
change edit link condition by id (fix name)
hidden edit button if can't edit (maybe previewed object)
Merge pull request #139 from arton/master

hide edit button if preview
Merge branch 'master' of git://github.com/komagata/lokka
index only shows non draft pages
index only shows non draft pages.
Merge pull request #140 from arton/master

fixing top page's index  for contains only non draft pages
Merge branch 'master' of git://github.com/komagata/lokka

Conflicts:
	public/theme/jarvi/layout.erb
link to # if entry was vanished
index only shows non draft pages.
update one-column-neue
update one-column-neue
Merge branch 'master' of github.com:komagata/lokka
Fix bug 141

Handle uniqueness of Categories in the same way as Entries.
To enable this patch, one should re-create DB file.
Merge pull request #142 from tomykaira/bug_141

Fix bug #141