Merging files from temp
Merge branch 'master' of https://github.com/hydrospell/static-electricity-cms

Conflicts:
	db/index.json
Cleaned up merge from temp