Adds undobar as submodule, fixes bug with calendar picker
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
Merge remote-tracking branch 'origin/master'
module updates/optimize imports