Re-roll.
Merge branch '6043-2' into 6043-2-tests
Merge branch '6043-2' into 6043-2-tests
Fix biblio/publication...
For some reason fails. Rollback to biblio...
Merge branch '6043-2' into 6043-2-tests
Merge branch '6043-2' into 6043-2-tests

Conflicts:
	openscholar/modules/os/modules/os_sv_list/plugins/os_sv_list.inc
Squashed commit of the following:

commit 29e77786e0e69d2810874603b6ac4d193cd42bba
Merge: 92153b6 8e22dd1
Author: Shushu Inbar <shushu@gizra.com>
Date:   Tue Jun 10 10:02:59 2014 +0300

    Merge branch '6043-2-tests' into 6043-2-time-cache

commit 92153b674b62f85d6b8d0063a54f2b7cd9451b8b
Merge: eae5e56 81eeaf1
Author: Shushu Inbar <shushu@gizra.com>
Date:   Mon Jun 9 13:59:50 2014 +0300

    Merge branch '6043-2' into 6043-2-time-cache

commit eae5e566888b20ee420e222c48aae7a81d6e6796
Author: Shushu Inbar <shushu@gizra.com>
Date:   Mon Jun 9 13:58:25 2014 +0300

    Simple test for cache time.

commit 4a02c2680c7babbe1b57601ec33444ca33e7abb9
Author: Shushu Inbar <shushu@gizra.com>
Date:   Mon Jun 9 13:52:57 2014 +0300

    This widget output changes from 'aaaa' to 'bbbb' every `cache_time`.

commit b930f794572ca5f263c58bc212d885d477626d31
Author: ran81 <ran@gizra.com>
Date:   Mon Jun 9 17:41:05 2014 +0800

    Work on cache time test.

commit c1259b6ea26fa2405f91f2bc6aa39e2daab3e7a5
Author: shushu <shushu@Amir-work.(none)>
Date:   Sun Jun 8 16:56:59 2014 +0300

    Skeleton for time test.
WIP test.
Merge branch '6043-2-tests' into 6043-2-entity