spaces -> tabs and reindented.
Merge branch 'dev' into devDan
fixed conflict from changing ptor to browser from getInstance()
fixed some lingering conflicts - removed ignore from catch blocks