Fix sidebar booking templates when salary module is enabled.
Update CHANGELOG.
Adapt some specs to new BookingTemplate.to_s.
Use fullname config for vcard forms.
Add print/pdf link for accounts view.
Merge remote-tracking branch 'origin/staging'
Update CHANGELOG.
Only show tenant name, not address in header.
Only show user menu if logged in.
Add datepicker add-on.
Update CHANGELOG.
Merge branch 'master' of github.com:huerlisi/bookyt
Sync user form with lyb_devise_admin.
Drop fancy buttons gem.
Update copyright years.
Added Omniauth for Devise with Google Apps
Fixed missing attr_accessible in Tenant to make demo seed working.
Merge branch 'master' of git://github.com/huerlisi/bookyt into new_master

Conflicts:
	Gemfile.lock
Exclude assets from log.
Add missing faraday gem.