Merge front_end dev branch to master

Do it