BK-1149 Create page for Site settings in control center
Fix conflict on merge https://github.com/sourcefabric/Booktype into 2.0
BK-1150 Create page for General settings in control center
Merge branch '2.0' of git://github.com/sourcefabric/Booktype into 2.0
BK-1014: JavaScript files should not be chmod executable
BK-1014: Delete left-over gitignore file
Merge branch '2.0' of git://github.com/sourcefabric/Booktype into 2.0
BK-1044 Convert old config functionality to new booktype application
BK-1151 Create page for People settings in Control center
Merge branch '2.0' of https://github.com/sourcefabric/Booktype into 2.0
Merge branch '2.0' of git://github.com/sourcefabric/Booktype into 2.0
Update link to user manual