Ui merge with dev...

Created new 'development' branch to merge UI branch into. Goal is to merge UI with master but I prefer to cautiously merge with dev and then with master if all goes well.