Initial import of antenna 1.2.1-beta, from http://sourceforge.net/projects/antenna/files/antenna/Antenna%201.2.1-beta/antenna-src-1.2.1-beta.zip/download
Merge remote-tracking branch 'origin/master'