export to xls
Merge pull request #8 from moinhaidar/export-to-xls

export to xls
settings model added
conflict resolved
POC for saving alarm settings
Merge branch 'master' of https://github.com/psahni/StatusManager into almighty-admin

Resolved Conflicts:
	Gemfile
	Gemfile.lock
	app/models/member.rb