Merge branch 'release/0.1.2' into develop
Change order of javascript and add dfp_footer in place of dfp_header
Prep for release
Merge branch 'release/0.2'