Merge branch 'develop'
Adjusting header, fixing some links