update
Merge branch 'master' of https://github.com/sjordancr/cl_bt_system

Conflicts:
	project_flies/cl_bt_system/src/applicationContext.xml
Merge branch 'master' of https://github.com/sjordancr/cl_bt_system

Conflicts:
	project_flies/cl_bt_system/src/applicationContext-security.xml