Electronics added.
Merge branch 'master' of https://github.com/coolmach/coolapp

Conflicts:
	src/com/cbuddy/beans/Pdmo.java
sql/db_backup.sql