feedback van Frederic
Jesamine closed #27

Merge branch 'develop'

* develop:
  closed #27

Conflicts:
	js/script.dist.js.map
Merge branch 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3

# By Charlotte Vanroelen
# Via Charlotte Vanroelen
* 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3:
  feedback van Frederic

Conflicts:
	js/script.dist.js.map
Solved #19
Fixed #28: draggable with jquery instead of jqueryUi. Still chewing on resizable.
Jesamine solved #19
Merge branch 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3

# By Jesamine Deprez-Degryse
# Via Jesamine Deprez-Degryse
* 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3:
  Solved #19

Conflicts:
	js/script.dist.js.map
saving...
Merge branch 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3

# By Charlotte Vanroelen
# Via Charlotte Vanroelen
* 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3:
  Fixed #28: draggable with jquery instead of jqueryUi. Still chewing on resizable.

Conflicts:
	css/screen.css
	js/script.dist.js.map
Resolved #28: Resizing also works without jqueryUI.
Gewerkt aan design en code van toolbar
Merge branch 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3

# By Charlotte Vanroelen
# Via Charlotte Vanroelen
* 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3:
  Resolved #28: Resizing also works without jqueryUI.

Conflicts:
	css/screen.css
	js/script.dist.js.map
Closed #20
Fixed #29: Using bean events with toolbar
Jesamine closed #20
Charlotte closed #29
Merge branch 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3

# By Jesamine Deprez-Degryse
# Via Jesamine Deprez-Degryse
* 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3:
  Closed #20

Conflicts:
	css/screen.css
	css/src/screen.scss
	js/script.dist.js
	js/script.dist.js.map
	js/src/classes/Toolbar.js
merge fix
merge fix: line create
mail test
Resolved #21 & #30
making group page user-friendly.