home settings
Merge branch 'master' of https://github.com/famousz/enosis

Conflicts:
	db/enosis.db
SAE support
Merge branch 'master' of https://github.com/famousz/enosis

Conflicts:
	db/enosis.db