added gson library to libs folder
Added .gitignore file
Content frames set to INVISIBLE instead of GONE

This should hopefully make it so the progress frame will maintain the
same height and width as the content frame, instead of always wrapping
the loading indicator. This should hopefully keep the loading
indicator in the center of the view as the user would expect it.
Merged in the booking process from the customer app, fixed lots of ish. Updated logo
Added pxToDp() to conversionUtils
Added new time format string constant to time utils
Merge remote-tracking branch 'origin/master'
Added ABS support to ProGuard

Application was crashing on launch in beta. Needed to add an option to
ProGuard to keep all the ActionBarSherlock constructors, as suggested
here:
http://stackoverflow.com/questions/14111150/application-stopped-working-after-enabling-proguard.

Also made a quick fix to the dialog for categories in the
BookingHomeFragment, so that it's automatically closed when an item
is selected.
Added logging of requests and responses

Added log statements for request URL, request body, response code, and
response body.
Parsed subcategories from JSON

Parsed the subcategories in the loadSubcateories() method. Need to
display them now.
Adding utility classes for GCM and Play Services

Committing to work remotely
Adding GCMUtils to remote

The last push seemed to not include GCMUtils class that was added. Made
a minor edit to push again.
Trying to sync desktop and laptop
Merge remote-tracking branch 'origin/gcm_and_play_services' into gcm_and_play_services

Conflicts:
	src/com/overthink/mechmaid/util/GcmUtils.java
Implementing GCM support

- Began the process of registering a user in the apps
- Added a BroadcastReceiver and IntentService for handling incoming
messages
Committing to work remotely
Custom views now displayed in graphical editors
Merge branch 'master' of https://github.com/krose72204/MechMaid

Conflicts:
	.gitignore