Changes [ by array() in MainController
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.lock
Merge remote-tracking branch 'origin/master'
Logout Button added