testing new unit test
improving unit test
Merge branch 'develop' of github.com:inboundnow/landing-pages into develop

Conflicts:
	tests/travis-ci/test.activations.php