Merge pull request #14 from bahaa360/master

Auto Pull (use me if you're lazy)
added icon to login
Merge pull request #15 from bahaa360/master

Almost Complete LoginActivity
created PetActivity
Merge pull request #16 from 3olcin/master

Created PetActivity
Added a constants class for use in intents.
added server as constant
inventory activity
added nav buttons
changed import
merged
conflicts
am conflict
merged
android manifest
merge
Merge pull request #23 from 3olcin/master

merge please
Added nav buttons to inventory layout
Merge pull request #24 from 3olcin/master

Added nav buttons to inventory layout