Merge pull request #27 from rpandey1234/master

First version of FB integration
Merge pull request #28 from rpandey1234/master

Grab and display Facebook access token
Added ability to tag photo with a company.

Tag automatically suggests companies based on what you enter. After
tagging, you unlock further editing tools.

Also changed the login page to skip logging in for testing purposes.
Merge pull request #31 from rpandey1234/master

Send get request to server to communicate fb token, move logout button to options menu
Merge pull request #29 from elihart/master

Added ability to tag photo with company name
Merge pull request #32 from rpandey1234/master

Add greeting on MainActivity page and remove commented code
Can now add a logo to a picture.

Only logo right now is nike. Need to make it so logo selection is based
on company tag. Need to improve UI for logo placement and adjustment.
Merge branch 'master' of https://github.com/maplesyrup/maple-android
Merge pull request #33 from elihart/master

Added basic logo functionailty.
Added text functionality to pictures.

The method I am using to merge the text into the original bitmap leaves
the text blurry afterward. This needs to be done better.

Need to add options to change text color/style/font/size
Fixed issue with blurry text.

The problem wasn't with merging the bitmaps. Turns out the compression
to a byte stream was causing it. I changed the compression to use png
instead of jpg and now it's good!
Added ability to change text color.

Using one of the premade examples in the SDK -> ColorPickerDialog.java
Merge pull request #34 from elihart/master

Added option to add text to pictures
merge Eli's changes and few bug fixes