Minor changes to formatting
Merge branch 'master' of https://github.com/edatrix/clone_wars

Conflicts:
	db/page_development.sqlite3
	db/page_test.sqlite3
Creates edit and update feature