try to load plugins before session is started
Merge branch 'master' of github.com:OSBI/saiku-ui
Merge branch 'master' of git://github.com/OSBI/saiku-ui
fix upgrade mess
INNODEA: removed unnecesarry buttons
INNODEA: embedded login
Merge branch 'master' of git://github.com/OSBI/saiku-ui

Conflicts:
	index.html
Merge branch 'master' into innod

Conflicts:
	index.html
	js/saiku/Settings.js
	js/saiku/models/Session.js