20121218_Beta
Merge branch '20141119_KiCad' into 20141118_KiCad