Merge branch 'release/0.2' into develop
SlimJim CMS
Remove unused file from the CMS
Merge pull request #2 from alex56480/develop

Develop
Adding webkit support
Default db is slimjim
Assuming root user without password
Updates to instructions
Merge branch 'release/0.3'