v.7.0

v.7.0
Merge branch 'master' of https://github.com/magic1979/MyApp_test

Conflicts:
	www/Token.html