Fixed a bug with getting the suggestions
Merge branch 'master' of https://github.com/NomeAutomation/NomeAutomation

Conflicts:
	res/db_class_mapping.xml