Merge branch 'master' of https://github.com/shukhi/MainProject into FinalIntegration

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/java/com/shukhi/shukhi/DayActivity.java
	app/src/main/java/com/shukhi/shukhi/EditEventActivity.java
	app/src/main/java/com/shukhi/shukhi/SingleFragmentActivity.java
	app/src/main/java/com/shukhi/shukhi/adapter/DayViewAdapter.java
	app/src/main/java/com/shukhi/shukhi/fragment/DatePickerFragment.java
	app/src/main/java/com/shukhi/shukhi/fragment/EditEventFragment.java
	app/src/main/java/com/shukhi/shukhi/fragment/Event.java
	app/src/main/java/com/shukhi/shukhi/fragment/SortEvents.java
	app/src/main/java/com/shukhi/shukhi/fragment/TimePickerDialogFragment.java
	app/src/main/res/layout/activity_fragment.xml
	app/src/main/res/layout/edit_event_fragment.xml
	app/src/main/res/layout/edit_fragment_actionbar.xml
	app/src/main/res/layout/event_fragment.xml