Merge pull request #1 from kibio/master

merge
cleanup
Merge pull request #2 from kibio/feature-bootstrapTemplate

Feature bootstrap template
fix typo
replaced table with sortable
Merge pull request #1 from yyolk/feature-bootstrapTemplate

Feature bootstrap template