Conflict.
Conflict?
CV_2 & crazy crop-methods added
Toolbar panel updated + new CV_3, documentView
Update the new templates, now editable (EDUCATION).
Copy works, cut works but doesn't "delete" the selected text, and paste doesn't work.
Copy, cut and paste works!
Select all works!
separated big propertyChange & updated Labels
Minor tooltipping, commenting and etc.
improvement MainController
improvement MainController - now I like IT
Merge branch 'master' of https://github.com/Majoo/Create

Conflicts:
	src/se/chalmers/tda367/group25/resumate/controllers/MainController.java
Conflict fixed, majooooooooooooooooo
Update, trying to grayscale with checkbox.
Some updates for RMText
Merge branch 'master' of https://github.com/Majoo/Create

Conflicts:
	src/se/chalmers/tda367/group25/resumate/controllers/MainController.java
Minor update.
Merge branch 'master' of https://github.com/Majoo/Create
PDF Export should work now.