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
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
Merge branch 'master' of https://github.com/TheHoneybadgers/frop

Conflicts:
	fropAndroid/src/com/honeybadgers/fropandroid/MainActivity.java
Merge branch 'master' of https://github.com/TheHoneybadgers/frop into merge_fixes

Fixing merge issues...
fixed merge conflicts for event add page
Removed commented bind() calls.
Cleaned up code. Removed comments. Added fields to database query.
Cleaned up form styling.
Implemented login, added UI changes,Added Icon, Made some major changes to program flow
Cleaned up the form styling.
Removed the redundant, hardcoded cookie line
Added newlines where none existed, removed double comment
Merge pull request #31 from rautsagar/master

Took care of the minor niggles, and Shipped!
Fixed event_detail name in frop.js
Fixed a bug where browser opened on pressing the back button after login
Merge pull request #33 from rautsagar/master

Fixed a bug where browser opened on pressing the back button after login, removed some unnecessary imports & logging code.