Combining the frontend development to master