analysis item
Merge branch 'master' of https://github.com/nevor1530/t201404-01

Conflicts:
	css/style.css
charge and pay pages