Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	myworkouts-app2/platforms/android/assets/www/css/index.css
	myworkouts-app2/platforms/android/assets/www/img/logo.png
	myworkouts-app2/platforms/android/assets/www/index.html