style changes dialog-config, removed non-working buttons
styled event-table jqGrid-like
navigation through parents and children in editObject
Merge branch 'master' of https://github.com/ioBroker/ioBroker.admin
Merge branch 'master' of https://github.com/ioBroker/ioBroker.admin
Update README.md
Merge pull request #6 from hobbyquaker/master

event table style, navigation through parent/children in editObject
Merge pull request #7 from GermanBluefox/master

(Bluefox) add icons and update of meta of adapters
(Bluefox) add translation functions and showMessage function.
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	README.md
	www/js/adapter-settings.js