commit merge
"merge"
Merge branch 'master' of https://github.com/Alivebox/pinBoard

Conflicts:
	.idea/workspace.xml
	app/controller/whiteboard/EditWhiteBoardController.js