More #1510
Merge branch 'master' of git://github.com/flavour/eden
S3Translate: skip phantom CSVs
Merge branch 'master' of git://github.com/flavour/eden
Migrate inv to S3Filter.
execute a couple of @todos in budget model
Add KH & NP to gis_hierarchy & IFRC gis_config. Catch too much recursion
within gis.update_location_tree() [Bad Data]
Merge pull request #711 from nerdis/master

execute a couple of @todos in budget model
Merge pull request #712 from Anurag-Ans/master

Fix for ticket id #1487
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of github.com:flavour/eden
Filtered map layers shouldn't be restricted to BBOX, as we may wish to
zoom out as well as in.
Fix Maps instantiated with bounds (such as Profiles)
Fix SVG output
IS_PHONE_NUMBER with option to enforce E.123 international notation.
Bug fix
Deployment setting to turn off international format requirement in IS_PHONE_NUMBER, unit tests for validator
Implement missing controllers and onaccepts, cleanups/fixes, safe defaults
Assets: Support setting of Condition/Room during Import
Merge branch 'master' of git://github.com/flavour/eden