merged from development - branch

commit 28811dd6adb6eae99fb706a21f26a1e0e146803e
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Sep 23 14:10:51 2012 +0200

    first commit geolocation cloudmade osm module

commit d268c1bb3b4353ced68c1facacf2378ceaa4b35d
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Sep 23 14:10:17 2012 +0200

    removed paging settings

commit b9f5becfbbaea6c1be0706eb2d9c97188631bf26
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Sep 23 10:20:23 2012 +0200

    bug fix for geolocation field

commit 13af51a81f163940ddb3966d9b13e542d9c00ae4
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Sep 23 10:16:12 2012 +0200

    dynamic maps could be invoked by geolocation module

commit 461f86f6b00c9f0493f3380cade1116392755eb5
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Sep 23 10:15:26 2012 +0200

    refactored access callback

commit d742c35d8c6185c441bcd6344fd86428b92df3b3
Author: Holger Kreis <holger@markaspot.org>
Date:   Fri Sep 21 10:47:17 2012 +0200

    added services 3.0 dev-branch

commit 9ade3f82016667cd8b83351b0ce0a8be0369abeb
Author: Holger Kreis <holger@markaspot.org>
Date:   Thu Sep 20 16:37:49 2012 +0200

    get leaflet from CDN / api key for settings

commit 583887959ed19301687cfb01b014144939e7ba0c
Author: Holger Kreis <holger@markaspot.org>
Date:   Thu Sep 20 16:37:08 2012 +0200

    some updates

commit c892f3dfaac767501a0075237f06744f9e2c02fd
Author: Holger Kreis <holger@markaspot.org>
Date:   Thu Sep 20 16:35:19 2012 +0200

    moved decencies upwards

commit 25a7a0c7642b04651069563db89280d769670b72
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Sep 18 18:50:51 2012 +0200

    updated feature

commit 8fb93fbc3ccffbf17ddfc39246895ec33cae82ce
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Sep 18 18:49:16 2012 +0200

    removed leaflet

    will be provided by cdn

commit 8d77b7de9d1fabd085f12cad0779005c283299c8
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Sep 18 16:27:06 2012 +0200

    rearranged node creation array

commit 3c0e00b3789288e00c899b51a31cc984033cd68c
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Sep 18 12:35:36 2012 +0200

    changed installation process

commit fec2753c61d24ab137f9b52cd229ffd3111f89a0
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Sep 18 12:35:20 2012 +0200

    bugfixes

commit 69a60fb75baddfc6edc4aa39db4ee6386582ebc0
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Sep 18 12:35:02 2012 +0200

    added spyc.php

commit 19c6e132ad2a5fabfe772436d02fc63f5906a29a
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Sep 18 07:57:47 2012 +0200

    refactored address-handling

commit 6bec5884dfce55c51fcb9bef9a6d528469ece733
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Sep 18 07:57:17 2012 +0200

    refactored to contrib release state

commit d071672fced0598497cd6f811656d3011d902ea8
Author: Holger Kreis <holger@markaspot.org>
Date:   Mon Sep 17 18:23:24 2012 +0200

    feature update

commit 5e81263cd2d474320bbd2235b3a4f61a87029baf
Author: Holger Kreis <holger@markaspot.org>
Date:   Mon Sep 17 18:01:11 2012 +0200

    implementation of hook_rest_server_response_formatters_alter

commit 172c104cc66a39cb979ebe74bb18384833133aa9
Author: Holger Kreis <holger@markaspot.org>
Date:   Mon Sep 17 17:55:27 2012 +0200

    don't need crush in here

commit dbbed05fcc85c87d160c4f9b126b5ae806916ac5
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Sep 16 16:07:39 2012 +0200

    merged back from master

commit b1cb6f3feaa4619f7bb5abec2a9708939ba658c2
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Sep 16 16:05:59 2012 +0200

    permission change

commit 145db50e91e65c8ad09a5fae52878c7c96e1f6c3
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Sep 16 16:05:19 2012 +0200

    changed to curl

commit 67a052c767e34f254c91dbb394044ea258b6d255
Author: Holger Kreis <holger@markaspot.org>
Date:   Fri Aug 31 18:49:51 2012 +0200

    Squashed commit of the following:

    commit ad495b8551b2c3f5c79a59da46db4e5e595884cc
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Aug 27 18:25:24 2012 +0200

        added permission to feature

    commit 30f62055dbeddd2915cb5cba23545329d3c62fb5
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Aug 27 17:04:00 2012 +0200

        small fixes and new parameters for georeport

    commit 0ab4a5a26bcdbc1530145f50a89b97928c55ed80
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Sun Aug 26 18:35:51 2012 +0200

        feature update (thumb in views)

    commit 920803284fa97e83ada24ce5454058500bef8427
    Merge: 5d8e824 b3e25c5
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Sun Aug 26 10:10:09 2012 +0200

        merged origin

    commit 5d8e82454ca0e9deb4c2d716e916d15ec5063fc1
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Sat Aug 25 18:56:29 2012 +0200

        open311 georeport fixes

    commit b3e25c50967358c0a951f714e36087ca7e8a94bf
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Sat Aug 25 18:56:29 2012 +0200

        open311 georeport fixes

    commit 4e1ad9cca43c035cb52fd40519773d3e69a43e01
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Aug 20 19:03:15 2012 +0200

        added metadata, type and keywords fields to fit the current mark-a-spot workflow

    commit c3089d4b81d8ada553dbf7fbbca393e45ee3c1a4
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Aug 20 19:01:58 2012 +0200

        updated panels and ctools

    commit 2caefa8583b4d9c2500e73d18da0986dfc9f5895
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Sun Aug 12 09:11:36 2012 +0200

        updated contributed modules

    commit b659a9678d7d52d10ab55e7e6356915c577c8ac9
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Thu Aug 2 21:20:13 2012 +0200

        tweet311 feature and fixes

        module fixes and feature update for 2.1
        added check for report node type
        pre fill users mail if adding reports signed in
        fixed field_length for services
        added some additional capability for searching hashtags
        added tweet311 feature for 2.1

    commit d048bb03b3de1d8e58ccd945a276e45ab1378b5f
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Jun 25 20:17:05 2012 +0200

        changed some initial content

    commit 46a5134034f43bd4469789c0bf04bcd06cd0baad
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Jun 25 19:39:13 2012 +0200

        changed field type to integer

    commit 3a3e31c924fc65ba63b5064f9cd3a61d29ad7288
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Jun 25 19:38:27 2012 +0200

        prepared geoReport service definition

    commit 85fadd0fd145d9bf937eeb3659d1f8e18e2a55e9
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Jun 25 19:37:48 2012 +0200

        prepared archive markers and "no marker" message

    commit 0f4baa22058ec2e2037f5d0feab6f94ac2a5f096
    Merge: 9bbebfc ca1c398
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Jun 25 19:37:06 2012 +0200

        removed flag from list view

        Conflicts:
        	profiles/markaspot/modules/mark_a_spot/modules/markaspot_logic/js/markers_googlemaps.js

    commit 9bbebfc96f74fcd1f66a3da6812523bb5fce48af
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Mon Jun 25 19:32:00 2012 +0200

        hotfixes for 2.0.4

    commit 87e74eb06bde16703bd4315b5393c04ee7bcda0c
    Author: Holger Kreis <holger@markaspot.org>
    Date:   Wed Jun 20 06:25:46 2012 +0200

        hotfixes 0.3

        cleanup in log module,  open311 changed string to array, wrong type of arguments

commit 306cde558bc33af91e43b3fe7d1a37e567499e7a
Author: Holger Kreis <holger@markaspot.org>
Date:   Thu Aug 2 21:13:48 2012 +0200

    module fixes and feature update for 2.1

commit 2da17f4fd7c7736a56d5ace3f61fcf47d6ca0310
Author: Holger Kreis <holger@markaspot.org>
Date:   Thu Aug 2 18:53:48 2012 +0200

    several fixes for 2.1

commit 8fc26b3efe55878f56d159deaeade2a9a8c8bc04
Author: Holger Kreis <holger@markaspot.org>
Date:   Thu Aug 2 18:50:50 2012 +0200

    small fix

commit 30b2f52be61d6db907c8d891f44170749fc4ab85
Author: Holger Kreis <holger@markaspot.org>
Date:   Thu Aug 2 18:50:37 2012 +0200

    added check for report node type

commit 00b5ef1f1b7af7cd4dad3a2a0f4af60a726ef3bc
Author: Holger Kreis <holger@markaspot.org>
Date:   Thu Aug 2 18:49:28 2012 +0200

    added node type to js

commit 215d755595b125e94cbccc95bb7514ab28af86f9
Author: Holger Kreis <holger@markaspot.org>
Date:   Sat Jul 21 12:20:54 2012 +0200

    pre fill users mail

commit 694d2e7664891d0e4433226098d84af110f5df43
Author: Holger Kreis <holger@markaspot.org>
Date:   Tue Jul 17 07:32:31 2012 +0200

    fixed field_length

commit d508d72e4bb3d57fb477740209e5d2dcd831481d
Author: Holger Kreis <holger@markaspot.org>
Date:   Sun Jul 15 18:44:30 2012 +0200

    added some additional capability for searching hashtags

commit 27a4850ac059dd5a0ee712cadb5ba817d710ae7e
Author: Holger Kreis <holger@markaspot.org>
Date:   Fri Jul 13 18:15:10 2012 +0200

    added tweet311 feature for 2.1