Merge branch 'trial'

Conflicts:
	trial_map/AndroidManifest.xml
	trial_map/gen/com/example/trial_map/R.java
	trial_map/res/values/strings.xml
	trial_map/src/com/example/trial_map/Event.java
	trial_map/src/com/example/trial_map/EventsFactory.java
	trial_map/src/com/example/trial_map/MainActivity.java
Merge branch 'trial'

Conflicts:
	trial_map/AndroidManifest.xml
	trial_map/gen/com/example/trial_map/R.java
	trial_map/res/values/strings.xml
	trial_map/src/com/example/trial_map/Event.java
	trial_map/src/com/example/trial_map/EventsFactory.java
	trial_map/src/com/example/trial_map/MainActivity.java
code that also displays events as list