Merge tag '2014-10-02' into develop

2014-10-02 Release
Merge tag '2014-10-02-fix' into develop

Fix
Merge tag '2014-10-02-fix2' into develop

Fix
Merge tag '2014-10-02-fix3' into develop

Fix
Merge tag '2014-10-02-fix4' into develop

Fix
Merge tag '2014-10-02-fix5' into develop

Fix
New company fields
Merge branch 'release/20141003'