pimp my sticker
Merge remote-tracking branch 'origin/branch_31_03_2014' into branch_31_03_2014

Conflicts:
	.idea/workspace.xml
	client/views/scum-board/scrum-board.html
Merge remote-tracking branch 'origin/branch_31_03_2014' into branch_31_03_2014

Conflicts:
	.idea/workspace.xml
	client/views/scum-board/user_stories_list.js
boom !!