Changed my UI mockup to fit style choices
Added database management mockup
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
Merge pull request #82 from firethanatos/master

Added database management mockup