Merge branch 'master' into develop
google Analytics test 1
Merge branch 'develop' of https://github.com/Krill221/RioCard into develop
google anal
google Analytics RC1
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/stat_controller.rb
Merge branch 'develop'
google Analytics RC1 (fix for production)
Merge remote-tracking branch 'origin/master'