indexchange
Merge branch 'master' of github.com:butze-mann/myosotis

Conflicts:
	application/views/scripts/history/index.phtml
Merge branch 'master' of github.com:butze-mann/myosotis