Small changes made

Edit pageg updated
Merge branch 'master' of https://github.com/Flaapjan/TEst

Conflicts:
	app/templates/forgotpass.html