Merge of front end develpment into master