Panel
Panel - drawable
Icon
Panel
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/ColorFragment.java
	MindSpace/MindSpace/src/com/utcLABS/mindspace/model/ConceptModel.java
Size - Position
Merge branch 'master' of https://github.com/frozarmony/MindSpace.git

Conflicts:
	MindSpace/MindSpace/res/drawable-hdpi/ic_action_see.png
	MindSpace/MindSpace/res/layout/fragment_visualisation.xml
	MindSpace/MindSpace/src/android/view/ext/EditionActivity.java
	MindSpace/MindSpace/src/com/utcLABS/mindspace/model/ConceptModel.java