Expand lock limit
Expand lock limit again
Remove rss/atom links from gp_category
Merge branch 'master' of github.com:zomeki/zomeki-development

Conflicts:
	lib/script.rb
Add feed piece to gp_category
Merge pull request #31 from kanety/rss

Rss
Merge branch 'master' of github.com:zomeki/zomeki-development