added some message keys
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/messages_en_US.properties
	src/main/resources/messages_zh_CN.properties
	src/main/webapp/WEB-INF/security.xml
	src/main/webapp/WEB-INF/views.xml
move serialNumber to Device entity
improve i18n