cleanup
Added Email Log button and functionality
layout warnings
Merge branch 'master' into mraidtwo