updated composer.json
updated readme
updated composer
fixed composer versions
fixed composer error
updated composer
fixed branch alias
Merge remote-tracking branch 'refs/remotes/origin/master' into 1.0

Conflicts:
	composer.json
fixed conflict version due to pull request
removed sidebar in favor of tab menu
Merge remote-tracking branch 'refs/remotes/origin/1.0'