Fixed bug in saving simplifyInventoryItems config option
Added option to choose between 12-hours or 24-hours time format in chat
Fix issue #15 : Wrong Media count for duplicated media
Merge branch 'master' of https://github.com/dege88/ingress-apk-mod into bugfix
Merge from bugfix
Added an option to turn off the view of seconds in 24h time format
Fixed build in OS X environment
Added option for disable recycle animation
Fixed readme
Fixed readme (added 15.07.2013 features)
Merge pull request #6 from onovy/master

Removed wrong version, correct is in src/broot/ingress/mod/Mod.java.
First-try migration to 1.31.1: without PortalInfoDialog modification (it has been refactored too hard)
Merge branch 'master' into 1.31.1
Fixed 'Scanner zoom in' feature for 1.31.1
Fixed PortalInfoDialog content (keys count etc)
Refactored chat format time a little
Fixed version and readme file
Fixed mute.py for 1.31.1
Merge remote-tracking branch 'remotes/o4kapuk/master'

Conflicts:
	src/broot/ingress/mod/util/Config.java