Merge pull request #80 from firethanatos/master

Added System Admin Manual sections
Modified activity marking screen to match template
Fixed spelling mistakes and file formatting
Added altered Activity Marking screenshots
Changed my UI mockup to fit style choices
Merge pull request #81 from itpun/master

Changed my UI mockup to fit style choices
Merge branch 'master' of github.com:Donnervoegel/java

Conflicts:
	docs/userManual.tex