Fixed java-doc in all classes
Resolved minor merge conflict in ApplicationStateTest and StorageManagerTest
Merge branch 'master' of https://github.com/Fingerpaint/project-code