Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/.name
	.idea/compiler.xml
	.idea/copyright/profiles_settings.xml
	.idea/encodings.xml
	.idea/gradle.xml
	.idea/libraries/ComAndroidSupportAppcompatV71901_aar.xml
	.idea/libraries/ComGoogleAndroidGmsPlayServices4030_aar.xml
	.idea/libraries/Gradle__ComAndroidSupportAppcompatV71901_aar.xml
	.idea/libraries/Gradle__ComGoogleAndroidGmsPlayServices4030_aar.xml
	.idea/libraries/Gradle__support_v4_19_0_1.xml
	.idea/libraries/support_v4_19_0_1.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vcs.xml
	app/app.iml
	app/build.gradle
	app/proguard-rules.txt
	app/src/main/AndroidManifest.xml
	app/src/main/java/il/ac/shenkar/todolist/ItemDetails.java
	app/src/main/java/il/ac/shenkar/todolist/MyBroadcastReceiver.java
	app/src/main/res/layout/create_task.xml
	app/src/main/res/layout/item_details_view.xml
	app/src/main/res/layout/main.xml
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
	gradlew.bat
	settings.gradle