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.
Styled the action bar, upped the required API level
Merge branch 'master' of https://github.com/TheHoneybadgers/frop

Conflicts:
	fropAndroid/src/com/honeybadgers/fropandroid/MainActivity.java
Implemented login, added UI changes,Added Icon, Made some major changes to program flow
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.
Merge pull request #32 from dgreenhalgh/eventDetailFix

Fixed event_detail name in frop.js
Merge branch 'master' of https://github.com/TheHoneybadgers/frop into merge_fixes

Merged in event fix from upstream master branch.
fixed php issues