Merge remote-tracking branch 'origin/development' into development
Fixed GUI component IDs in activity
General formatting of code
Tidying up formatting of code, javadoc and fixing some non-behaviour-related issues
Made some class-global variables final so they're not accidentally overwritten
Adding implicit and explicit event types
Refactored a lot of duplicate code into a super class
Small change to ack/nack popup to allow displaying of design-time sample controls
Removed ImplicitPopup base class, renamed ExplicitPopup base class to UserFeedbackPopup
Added GUI layouts for Timed Abort and Simple Notification popups
Created backing classes for both the above. Only implemented SimpleNotification so far
Added code for Timed Abort popup
Added code for Timed Abort background watcher - this will automatically send a response to pubsub if the notification isn't aborted within the allotted time
Programatically specify colour of items
Add intents to parent app so the new popups can be displayed
Moved TimedAbortProcessor class into its own file, made it into a singleton so it can be referenced from different components (EventListener and popup)
Changed parcelable key
Track ID of notification so multiple notifications can be displayed at same time
Merge remote-tracking branch 'origin/development' into development
Merge branch 'development' into paddy_android

Conflicts:
	android/client-frwk/SocietiesLibraries/AndroidPubSub/SocietiesAndroidPubsubHelper/src/org/societies/android/platform/pubsub/helper/PubsubHelper.java
	android/client-frwk/SocietiesLibraries/AndroidUserFeedback/AndroidUserFeedback/src/org/societies/android/platform/useragent/feedback/EventListener.java
	android/client-frwk/SocietiesLibraries/AndroidUserFeedback/AndroidUserFeedback/src/org/societies/android/platform/useragent/feedback/guis/AcknackPopup.java
	android/client-frwk/SocietiesLibraries/AndroidUserFeedback/AndroidUserFeedback/src/org/societies/android/platform/useragent/feedback/guis/CheckboxPopup.java
	android/client-frwk/SocietiesLibraries/AndroidUserFeedback/AndroidUserFeedback/src/org/societies/android/platform/useragent/feedback/guis/RadioPopup.java
Tidy up UF component before making changes
Fixed POM schema location - typo in file path
Some formatting and optimisation changes
Merge branch 'development' into paddy_webapp

Conflicts:
	user-agent/user-feedback/src/main/java/org/societies/useragent/feedback/UserFeedback.java
Merge branch 'Meiyii_webapp' into paddy_webapp