edit about page is done
bla
Merge branch 'edit_about' into develop

Conflicts:
	.gitignore
	main/about.pyc
	main/app.pyc
	main/models.pyc