Added a constants class for use in intents.
added server as constant
inventory activity
changed import
merged
merge