Merge tag '20141119081119' into develop

milestone: 20141119081119 20141119081119
add titan
Merge branch 'release/20141121214150'