Merge branch 'master' of https://github.com/gak-github/linktheinfo into develop
Merge branch 'master' into develop
applying bootstrap templates