added punto
6f-2
f8-7
f9-1
f9-1
f9-3
Merge branch 'feature/6feat' into develop
Merge branch 'feature/8feature' into develop
Merge branch 'feature/9' into develop
Squashed commit of the following:

commit f771196520a7f672b421e726489e4290eab8a27b
Author: ab <adamdd55@gmail.com>
Date:   Fri May 16 14:49:23 2014 +0200

    feat14-1
Merge branch 'release/f14'
Merge tag 'f14' into develop

REL14
Squashed commit of the following:

commit f9ac73e8f90b0b29de1c27794cea2ef0862322e2
Author: ab <adamdd55@gmail.com>
Date:   Fri May 16 15:19:28 2014 +0200

    f15-1
Merge branch 'release/f15'
Merge tag 'f15' into develop

REL15