changes towards swapping, largely by Ramesh
Merge branch 'master' of https://github.com/adalca/tipiX
changes for swap and rotate
Merge branch 'master' of https://github.com/adalca/tipiX

Conflicts:
	js/imDisplay.js
change to mipiX and additional features.