update from pjm 14/03/31
Merge branch 'master' of https://github.com/neopjm109/LUCAR
Merge branch 'master' of https://github.com/neopjm109/LUCAR
login success
Merge 140404
Merge 2 140404