Merge pull request #2 from inderdhir/develop

Develop
Merge pull request #4 from inderdhir/develop

Develop
Merge pull request #6 from inderdhir/develop

Develop
almost done with m7
done some m8
done m8
Added javadocs to EVERYTHING

Yes, even useless methods
Loading and Saving

Still needs a bit of fixing though
M9 completed
Fixed errors merging
So many merge fixes
Merge pull request #7 from inderdhir/shafiq

Merging shafiq into eli
Tidying up some small issues from merge
Merge pull request #8 from inderdhir/eli

Merging latest code (M9)