Added synching information
Merge branch 'master' of https://github.com/thatsIch/Applied-Energistics-2
Removes unnecessary semicolons
Improved readability of variables

Hopefully improved semantics of variables

Fixed typos

Added hyphenations
Added synching information
Merge branch 'master' of https://github.com/thatsIch/Applied-Energistics-2
Removes unnecessary semicolons
resolved conflict
Improved readability of variables

Hopefully improved semantics of variables

Fixed typos

Added hyphenations
Resolved conflicts
Re-added typo change
Resolved conflicts
Updated submodules
Updated Submodules
Renamed BaseMJPerdition file
Removed perdition class
Re-added perdition class
Added support for TeamCity adding version data
Moved stub api version numbers to build.properties
Oops, had a bad import at the top
Removed null teamcity code