Fixed ajp port
Merge branch 'dev'