Icons Circular Slider
Merge branch 'master' of https://github.com/frozarmony/MindSpace.git

Conflicts:
	MindSpace/MindSpace/src/android/view/ext/EditionActivity.java
	MindSpace/MindSpace/src/com/utcLABS/mindspace/VisualisationActivity.java