update SystemConcept.java #2
Merge branch 'deviceManager'

Conflicts:
	src/group503/SystemConcept.java