Changed dev footer
Changed master footer
Merged dev