proper rules edition
deadlock solving. Not finished.
The deadlock has been solved
Merge branch 'origin/deadlock'

Conflicts:
	c3po-core/src/main/java/com/petpet/c3po/controller/Controller.java