synch to master, migrating backend to bootstrap 3