First commit after restructuring my local directory (local version appeared to be corrupted).
Merge branch 'master' of https://github.com/empayne/CLcircuitdraw-android