updating deleted files
Merge branch 'master' of https://github.com/tarudoodi/workspace_FLU

Conflicts:
	FluNetwork/gen/com/example/flunetwork/Manifest.java
	FluNetwork/gen/com/example/flunetwork/R.java
	FluNetwork/gen/com/google/android/gms/R.java
	FluNetwork/res/layout/activity_add_event.xml