yadda tests
settings
temp
Merge branch 'master' into yadda

Conflicts:
	package.json
basic nightwatch demo working
fixed screenshot path
better test naming
custom command to check template name
custom command to check template name
moving waitForAjaxCompleted and waitForPageToBeMobified to custom commands