Edited README file
Merge remote-tracking branch 'origin/master' into v03

Conflicts:
	readme.txt
edited the README file
edited the README file
edited styles and html
edited styles and html