New company fields
Merge branch 'release/20141003'
Merge tag '20141003' into develop

Release 20141003