редизайн
Merge branch 'origin/master'

Conflicts:
	PhoneGap/www/index.html