Merge branch 'master' of C:\Users\Kysa\AndroidStudioProjects\IntelliGrid with conflicts.
Kysa (11/17) simulation values displayed & updating
Merge remote-tracking branch 'origin/master'

Conflicts:
	IntelliGrid/src/org/sdsu/intelligrid/graphics/ui/MainUI.java
Kysa (11/17) simulation values displayed & updating