added account page scripting
Merge branch 'master' of https://github.com/oliver-spryn/merchancs

Conflicts:
	account.html