Merge tag '201411031505' into develop

Version 201411031505 201411031505
Fixed code include
Fixed code include
Merge branch 'feature/fix_code_links' into develop
Version bumped
Merge branch 'release/201411031657'