Part of i18n, fix bugs..
Merge branch 'development' of https://github.com/code-busters/mosby into development

Conflicts:
	Mosby/WebContent/WEB-INF/web.xml