Merge branch 'master' of https://github.com/shehroze37/engduino_IDE

Conflicts:
	nbproject/UPDATED.TXT
	nbproject/private/private.properties
	nbproject/project.properties
	src/CodeView/CodeViewController.java
	src/utility_classes/uploadUtility.java
custom sketch
ne changes
new upload until
new updates
final
final
Merge branch 'master' of https://github.com/shehroze37/engduino_IDE