20130604<poi files added, jar refactor>
Merge remote-tracking branch 'origin/develop' into develop