co

co
Merge branch 'master' of https://github.com/thierryxing/Crc

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	apps/Hrms/common/app.js
	apps/Hrms/common/app/controller/Main.js
	apps/Hrms/common/app/profile/Tablet.js
	apps/Hrms/common/app/view/tablet/Main.js
	apps/Hrms/common/css/Hrms.css
	bin/Hrms-common.wlapp