Squashed commit of the following:

commit 9b2621ea8d8a4b015b14a7a101c54772b6bd77df
Author: Anca Zapuc <anca.zapuc@up-nxt.com>
Date:   Tue Jul 22 15:16:41 2014 +0300

    add folderTree and solve tests

commit dacefced463e9abe9a7ea244c57817cf881692ed
Merge: 617a052 64b880c
Author: Anca Zapuc <anca.zapuc@up-nxt.com>
Date:   Tue Jul 22 15:07:44 2014 +0300

    Merge remote-tracking branch 'upstream/master'

commit 617a052e2ad525a760f5281d1be989bff66c53cf
Author: Anca Zapuc <anca.zapuc@up-nxt.com>
Date:   Thu Jul 10 16:27:48 2014 +0300

    add bug tests

commit a2959dfee9cdd7602bf288dfb42f2dfda4073577
Author: Anca Zapuc <anca.zapuc@up-nxt.com>
Date:   Thu Jul 10 15:01:28 2014 +0300

    correct after merge

commit b56e8ee2f36e0ca8c113a0ec2a72981229238bdc
Merge: 37e113c 556675d
Author: Anca Zapuc <anca.zapuc@up-nxt.com>
Date:   Thu Jul 10 14:58:34 2014 +0300

    merge with main branch

commit 37e113ce409060d5f725a7b254edc6392b7be650
Author: Anca Zapuc <anca.zapuc@up-nxt.com>
Date:   Thu May 22 14:11:20 2014 +0300

    add more comments

commit 7b69c9a09f8c81cd685c5abb9bbc6115f2b2ca80
Author: Anca Zapuc <anca.zapuc@up-nxt.com>
Date:   Thu May 22 13:25:38 2014 +0300

    add failing test for queries limit

Signed-off-by: Kenneth Geerts <kenneth.geerts@up-nxt.com>
Version 0.5.11
Use update_properties to set properties on detached objects.
Conditional tests
fix merges