Activf2017 patch 2#4

activf2017 wants to merge 4 commits intomasteractivf2017/activf2017.github.io:masterfrom

activf2017-patch-2activf2017/activf2017.github.io:activf2017-patch-2Copy head branch name to clipboard