update SystemConcept.java, test!

check if other will see my change on SystemConcept.java
Merge branch 'deviceManager'
Merge branch 'master' of https://github.com/Group503/SystemConcept-Formal

Conflicts:
	src/group503/SystemConcept.java