Added Switchboard scaffold.
Added SwitchboardEntry scaffold. switchboard has_many switchboard_entries
Misc
Fixed a merging conflict.
Merge branch 'switchboard' into develop

Conflicts:
	app/models/sip_account.rb