mergeing
code from server
Merge branch 'master' of https://github.com/nishantmehta/SketchMyCircuit

Conflicts:
	gen/com/sketchmycircuit/R.java
	res/layout/activity_circuit_sketch_canvas.xml
	src/com/sketchmycircuit/component/SketchView.java
the final clea and merged code