[MERGE] javelin is now merged into master

[Kelven Yang]

A side note, when you are running management server with mvn, try to
increase the JVM memory settings

For linux/Mac users

MAVEN_OPTS="-XX:MaxPermSize=512m -Xmx2g"
export MAVEN_OPTS

For Windows users

Add similar settings to windows environment settings (via Windows control
panel)

Kelven