Monitoring Refactoring

Merge branch 'master' into demo2_dev

Conflicts:
	src/de/tudarmstadt/maki/simonstrator/api/Binder.java
	src/de/tudarmstadt/maki/simonstrator/api/Event.java
	src/de/tudarmstadt/maki/simonstrator/api/Monitor.java
	src/de/tudarmstadt/maki/simonstrator/api/Oracle.java
	src/de/tudarmstadt/maki/simonstrator/api/common/Attribute.java
	src/de/tudarmstadt/maki/simonstrator/api/common/Transmitable.java
	src/de/tudarmstadt/maki/simonstrator/api/common/UniqueID.java
	src/de/tudarmstadt/maki/simonstrator/api/common/metric/AbstractMetric.java
	src/de/tudarmstadt/maki/simonstrator/api/common/metric/Metric.java
	src/de/tudarmstadt/maki/simonstrator/api/component/core/MonitorComponent.java
	src/de/tudarmstadt/maki/simonstrator/api/component/core/OracleComponent.java
	src/de/tudarmstadt/maki/simonstrator/api/component/mape/DataListener.java
	src/de/tudarmstadt/maki/simonstrator/api/component/mape/DataPublisher.java
	src/de/tudarmstadt/maki/simonstrator/api/component/mape/monitoring/MonitoringAggregationAttribute.java
	src/de/tudarmstadt/maki/simonstrator/api/component/overlay/OverlayComponent.java
	src/de/tudarmstadt/maki/simonstrator/api/component/overlay/Serializer.java
	src/de/tudarmstadt/maki/simonstrator/api/component/overlay/SerializerComponent.java
	src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/Filter.java
	src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/Notification.java
	src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/PubSubComponent.java
	src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/Subscription.java
	src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/attribute/Attribute.java
	src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/attribute/AttributeFilter.java
	src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/attribute/FilterOperator.java
	src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/attribute/Topic.java
	src/de/tudarmstadt/maki/simonstrator/api/component/transport/service/FirewallService.java
	src/de/tudarmstadt/maki/simonstrator/api/component/transport/service/TransportService.java