killall phantomjs processes (in case there are leaks) when we start.
Merge remote-tracking branch 'origin/develop' into develop