Implemented PropertyChangeListener in Controller.java and propertyChange method.
Merge branch 'modelController' with master