Merge branch 'feature/6299_new_doc' into develop
authordrebs <drebs@leap.se>
Tue, 25 Nov 2014 14:30:40 +0000 (12:30 -0200)
committerdrebs <drebs@leap.se>
Tue, 25 Nov 2014 14:30:40 +0000 (12:30 -0200)

Trivial merge