Merge branch 'develop'
Merge branch 'develop'
Moving to a new bootstrap template and adding new widgets.