javadoc for Jeppe Eriksen
added back button functionality
Fixed merge conflicts between master and network