Introduced templates and jquery for the ui framework, + various fixes
Merge remote-tracking branch 'origin/master'