Modified ContextStorage - it is now a ConcurrentHashMap.
Renamed some files.
Modified ContextManager to correctly put items in the ContextStorage.
Merge remote-tracking branch 'origin/development/architecture' into
development/architecture

Conflicts:
	AmIciTy-incubator-Android/src/net/amicity/common/core/ContextManager.java