UPDATE: bootstrap, jquery, less js and base css added
Merge origin/master