Merge branch 'master' into mburton/ormlite

Conflicts:
	Tasks/app/app.iml
	Tasks/app/src/main/java/com/dummies/tasks/activity/TaskListActivity.java
	Tasks/app/src/main/java/com/dummies/tasks/activity/TaskListAndEditorActivity.java
	Tasks/app/src/main/java/com/dummies/tasks/fragment/TaskEditFragment.java
	Tasks/app/src/main/java/com/dummies/tasks/fragment/TaskListFragment.java
	Tasks/app/src/main/java/com/dummies/tasks/provider/TaskProvider.java
	Tasks/app/src/main/java/com/dummies/tasks/receiver/OnAlarmReceiver.java
	Tasks/app/src/main/java/com/dummies/tasks/receiver/OnBootReceiver.java
	Tasks/app/src/main/java/com/dummies/tasks/util/ReminderManager.java
	Tasks/app/src/main/res/values/strings.xml