Merge branch 'master' into mburton/ormlite

Conflicts:
	Tasks/app/app.iml
	Tasks/app/build.gradle
	Tasks/app/src/main/java/com/dummies/tasks/fragment/TaskEditFragment.java
	Tasks/app/src/main/java/com/dummies/tasks/fragment/TaskListFragment.java