Added nightly build to the release number.
Updated some gems.
Merge branch 'gem_update' into develop
Converted Factory to FactoryGirl.
Undo the last commit.
Upgraded FactoryGirl gem
Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock
Set a couple of :autofocus => true to make the UI better.
Remove unused ontroller
hide hotdeskable check box for tenant sip accounts
Merge branch 'develop' of github.com:amooma/GS5 into develop
show hot deskable option for user sip accounts only
fixed fallback_sip_accounts query
Changed defaults and added some basic docu.
comment
return true if login was successful but phone resync failed
Set :autofocus => true for the first_name.
snom idle icon settings
Merge branch 'develop' of github.com:amooma/GS5 into develop
clir function added