tes
Merge remote-tracking branch 'origin/master'

Conflicts:
	MiniBanking/web/WEB-INF/classes/ApplicationResources.properties