commit fde25eea54eb3e51da771fdce69277b650c654d4
Merge: 77e446e 630a94f
Author: Lukasz <lukasz@rebelmouse.com>
Date:   Thu Oct 8 08:31:39 2015 +0000

    merged fmp branch and resolved conflicts

commit 77e446ec3cd84ff9d731f1ad7cdd80ed553b939e
Merge: ee9c6a0 f493771
Author: Lukasz <lukasz@rebelmouse.com>
Date:   Thu Oct 8 08:26:08 2015 +0000

    Merge branch 'findmypast_main_branch'

commit f493771f8b30d57044aebd4339e9a14ce585e26e
Author: Lukasz <lukasz@rebelmouse.com>
Date:   Thu Oct 8 08:25:15 2015 +0000

    test fix [refs #findmypast_main_branch]

commit 3260f937165a7b8a55a915a3c96fdab8b4511bca
Merge: 69be68a ee9c6a0
Author: Lukasz <lukasz@rebelmouse.com>
Date:   Thu Oct 8 08:05:32 2015 +0000

    merge latest master [refs #findmypast_main_branch]

commit 630a94f7c56fb8ee55292b5c4810e68eb10e52a2
Merge: ee9c6a0 33d96b4
Author: Vladimir Kopytin <volodymyr.kopytin@rebelmouse.com>
Date:   Thu Oct 8 07:15:13 2015 +0000