updated min sdk to 14 aka Ice Cream Sandwich 4.0…doing this broke some UI elements in the sliding menu. fixed them
Merge branch 'develop'

Conflicts:
	.idea/workspace.xml