Models for beverages added
Getting groups from LDAP
Merged Beverages and master
Merge branch 'master' of github.com:contradictioned/FSIntra2013
Merge branch 'master' of github.com:contradictioned/FSIntra2013
Basic beverages done