Add default markup in admin/site/edit
Merge pull request #187 from rono23/add-default-markup

Add default markup in admin/site/edit
Upgrade sinatra, rake and rack
Remove ruby 1.8.7 support
Add ruby2.0 support
Remove waste file
Fix preview
Merge pull request #189 from rono23/fix-preview

Fix preview
Merge pull request #188 from hrysd/remove-waste-file

Remove waste file
Merge branch 'master' into portalshit

Conflicts:
	Gemfile.lock