.
Merge branch 'master' of https://github.com/lineker/mbanking

Conflicts:
	MobileBanking/WebContent/controller/Login.controller.js
commit