Merge branch 'master' of https://github.com/pentahohub/nexus.git

Change-Id: I9f697cefd68c013108c0cf8ea39289729bb9e748
Signed-off-by: LUOXC <lxc1317@hotmail.com>