language logo png
change login interface
change login mode
Merge remote-tracking branch 'origin/master'

* origin/master:
  add merchant update pages

Conflicts:
	src/main/java/au/com/iglooit/hellscream/controller/MerchantController.java