Brush selection drop-down menu + more brushes + new icon
Merge branch 'master' of
https://github.com/PDSD-2014/niculaescu-patrascoiu

Conflicts:
	WhiteBoard/res/layout/drawing_activity.xml
	WhiteBoard/src/com/example/drawings/DrawingActivity.java