Merge branch 'elvan' into develop
fixed problem: info view crashes without internet connection
doc
Merge branch 'develop' of https://github.com/jonasberglund/skrubb_DAT255 into develop

Conflicts:
	H-sektionen/src/se/chalmers/h_sektionen/utils/LoadData.java
Merge branch 'develop' into elvan