init front end architecture
Merge remote-tracking branch 'upstream/master'