added encode functyion to email field
Merge pull request #154 from RaspberryPints/develop

Left bar changes from develop to rc-1.0.0.x
Add moar kegs to test_data.sql
Changing beers in test_data.sql
Hiding two future release columns in tap_list.php
Fixed issues with broken footer
Fixed issues with broken footer
This is the code for the Untappd stuff... still showing by default.
Added the Style for untappd.
Added the code to not display the untappd brewery feed and rating if the clientid and breweryid are not set in the database.
Updated SQL to add the untappd config
Merge pull request #163 from mcangeli/Untappd

Untappd support
Merge branch 'rc-1.0.0.x' into develop

(rebasing)
Updating version number in config_files.php and schema.sql for release
Updating version in schema.sql and config_files.php for release
Merge branch 'rc-1.0.0.x' into develop

Conflicts:
	sql/schema.sql