+ActionBarSherlock
Merge branch 'master' of https://github.com/EKataskin/SmartToDo

Conflicts:
	.idea/workspace.xml