Inclusion of bootstrap
Local load of font-awesome, bootstrap, query
Merge branch 'develop'