Charging page WIP
Merge branch 'origin/master'

Conflicts:
	Gemfile
Fixed images
Merge branch 'origin/master'