updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	EventFoundryAndroid/EventFoundry/app/src/main/AndroidManifest.xml
	EventFoundryAndroid/EventFoundry/app/src/main/java/com/seniorproject/eventfoundry/eventfoundry/EventFragment.java
	EventFoundryAndroid/EventFoundry/app/src/main/java/com/seniorproject/eventfoundry/eventfoundry/MyMainActivity.java
Merge branch 'master' of https://github.com/Kingram91/SENIOR_PROJECT

Conflicts:
	EventFoundryAndroid/EventFoundry/app/build.gradle
	EventFoundryAndroid/EventFoundry/app/src/main/java/com/seniorproject/eventfoundry/eventfoundry/MyMainActivity.java
	EventFoundryAndroid/EventFoundry/app/src/main/res/values/strings.xml