Changed Travis badge to master
Merge pull request #34 from Label305/hotfix_default-colors

Merge settings fixes #33
Merge pull request #35 from Label305/dev

Bugfixes
Merge branch 'dev' into feature_searchable
Removed force setting of name in resource property factory