fixed issue #79 logout button
added missing template
fixed jshint
added missing ui-view
fixes #111
Merge branch 'master' into 111
Add test case
Merge branch 'master' of github.com:28msec/nolap-report-editor into recompile-all
added concepts and recompile pages.
adapted recompile html and js to recompile page.
added concepts page to taxonomy page.
added e2e test for recompiling all formulas.
Fix build
Fix build
Merge pull request #121 from 28msec/fix-master

Run build on firefox 31
Merge branch 'master' into recompile-all
Merge pull request #113 from 28msec/111

CSS improvements to the presentation tree
Merge branch 'master' into recompile-all
Merge branch 'master' of https://github.com/28msec/nolap-report-editor into recompile-all

Conflicts:
	app/report/taxonomy/taxonomy-page.js
	tests/e2e/report-scenario.js
Merge branch 'recompile-all' of https://github.com/28msec/nolap-report-editor into recompile-all

Conflicts:
	app/report/taxonomy/taxonomy-page.js
	tests/e2e/report-scenario.js