Merge tag '20141118083221' into develop

milestone: 20141118083221 20141118083221
intellij
Merge branch 'release/20141118083552'