final from vishal and nishant
Merge branch 'master' of https://github.com/nishantmehta/SketchMyCircuit

Conflicts:
	src/com/sketchmycircuit/component/SketchView.java