removed backup files, *~
Merge branch 'master' of https://github.com/gsaito/SF28v4

Conflicts:
	www/Intro-tunnel/page1.html~
	www/Intro-tunnel/userprofile.html~
	www/StatsProfile/main.html~
	www/index.html~
	www/js/app.js~
	www/js/sf28.js~
	www/styles/app.css~