Conflict with Laszlo.
Merge branch 'master' of https://github.com/Majoo/Create

Conflicts:
	src/se/chalmers/tda367/group25/resumate/views/MainView.java
	src/se/chalmers/tda367/group25/resumate/views/MenuBar.java
Merge branch 'master' of https://github.com/Majoo/Create

Conflicts:
	src/se/chalmers/tda367/group25/resumate/views/DocumentView.java
	src/se/chalmers/tda367/group25/resumate/views/MainView.java