Adding the marker icon
Alignment and icon update..
Merge branch 'master' of https://github.com/anetfreak/TodoStalker

Conflicts:
	res/layout/icon_view.xml