white space and formatting
Merge branch 'master' of https://github.com/robertcannon/jLEMSDev.git

Conflicts:
	src/org/lemsml/jlems/core/type/dynamics/Dynamics.java
Merge branch 'master' of https://github.com/robertcannon/jLEMSDev.git
Merge branch 'master' of https://github.com/robertcannon/jLEMSDev.git
logo generator