Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Footer copyright year now auto updates
Merge branch 'master' into develop
added signin/signout/control panel links in nav