cleanup
fixed flag file
renamed sub-projects
fixed classpath and versions of dependencies
fixed typo
signed cla
fixed flag file
2013-07-03: Merge branch 'mjuliano' into integration
fixed flag file