Merge branch 'master' of https://github.com/nigeldavidcarroll/maplemoney2

Conflicts:
	Index.html
	index.html
	www/index.html
www