Release 1.0.0a2
Merge branch 'master' into ttv-1.0

Conflicts:
	build.xml
	src/java/com/skynav/ttv/app/Version.java