merged taylor's changes

nch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Added login features. Manifest needs adjustment.
Styled the action bar, upped the required API level
adding functionality to event page
Merge branch 'master' of https://github.com/TheHoneybadgers/frop into db-connect
event page updated
added gov_orgs page
Merge pull request #24 from RePeet13/db-connect

Db connect
added event edit page
fixed some namespace issues, better naming conventions
Web Form in inital stable state. CSS not resolving properly.
Connecting all the components together. Still in progres...
Somewhat stable. Stil need to fix CSS and javascript.
Updates for backend support.
Merge pull request #27 from RePeet13/db-connect

Db connect
resolved merge conflicts
trying to fix merge issues.
Replaced references to 'Frop' with 'SocialGreek' in SocialGreek Android
Merge pull request #23 from Dlong88/master

Added login features.
Merge pull request #28 from TheHoneybadgers/rename

Replaced references to 'Frop' with 'SocialGreek' in SocialGreek Android