Merge branch 'master' into thevalueweb

.agignore

@@ -1 +0,0 @@
-app/assets/javascripts/metamaps.secret.bundle.js

.babelrc

@@ -1,10 +0,0 @@
-{
-  "presets": [
-    "react",
-    "es2015"
-  ],
-  "plugins": [
-    "lodash",
-    "transform-class-properties"
-  ]
-}

.buildpacks

@@ -1,2 +1 @@
-https://github.com/heroku/heroku-buildpack-nodejs.git
 https://github.com/heroku/heroku-buildpack-ruby.git

.codeclimate.yml

@@ -1,38 +0,0 @@
----
-engines:
-  brakeman:
-    enabled: true
-  bundler-audit:
-    enabled: true
-  duplication:
-    enabled: true
-    config:
-      languages:
-        count_threshold: 3 # rule of three
-        ruby:
-          mass_threshold: 36 # default: 18
-        javascript:
-          mass_threshold: 80 # default: 40
-  eslint:
-    enabled: true
-    channel: "eslint-3"
-  fixme:
-    enabled: true
-  rubocop:
-    enabled: true
-    exclude_fingerprints:
-      - 74f18007b920e8d81148d2f6a2756534
-ratings:
-  paths:
-  - 'Gemfile.lock'
-  - '**.erb'
-  - '**.rb'
-  - '**.js'
-  - '**.jsx'
-exclude_paths:
-- app/assets/images/
-- app/assets/javascripts/lib/
-- frontend/src/patched/
-- db/
-- script/
-- spec/

.eslintignore

@@ -1,3 +0,0 @@
-**/*{.,-}min.js
-frontend/src/patched/*
-app/assets/javascripts/lib/*

.eslintrc.js

@@ -1,26 +0,0 @@
-module.exports = {
-  "sourceType": "module",
-  "parser": "babel-eslint",
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
-    }
-  },
-  "extends": "standard",
-  "installedESLint": true,
-  "env": {
-    "es6": true,
-    "node": true
-  },
-  "plugins": [
-    "promise",
-    "standard",
-    "react"
-  ],
-  "rules": {
-    "react/jsx-uses-react": [2],
-    "react/jsx-uses-vars": [2],
-    "space-before-function-paren": [2, "never"],
-    "yoda": [2, "never", { "exceptRange": true }]
-  }
-}

.example-env

@@ -1,56 +0,0 @@
-# Node JS env
-export NODE_REALTIME_PORT='5000' # should match REALTIME_SERVER, below
-
-# Rails env
-export DB_USERNAME='postgres'
-export DB_PASSWORD='3112'
-export DB_HOST='localhost'
-export DB_PORT='5432'
-export DB_NAME='metamaps'
-
-export REALTIME_SERVER='http://localhost:5000'
-export MAILER_DEFAULT_URL='localhost:3000'
-export DEVISE_MAILER_SENDER='team@metamaps.cc'
-
-export DEVISE_SECRET_KEY='f71c467e526f23d614b3b08866cad4788c502bed869c282f06e73ee6c94675b62fe1f6d52fa7ba8196b33031f0d2f3b67e27ea07693c52ecebccb01700cad614'
-export SECRET_KEY_BASE='267c8a84f63963282f45bc3010eaddf027abfab58fc759d6e239c8005f85ee99d6d01b1ab6394cdee9ca7f8c9213a0cf91d3d8d3350f096123e2caccbcc0924f'
-
-# # you can safely leave these blank, unless you're deploying an instance, in
-# # which case you'll need to set them up
-#
-# export S3_REGION
-# export S3_BUCKET_NAME
-# export AWS_ACCESS_KEY_ID
-# export AWS_SECRET_ACCESS_KEY
-#
-# export SMTP_DOMAIN
-# export SMTP_PASSWORD
-# export SMTP_PORT
-# export SMTP_SERVER
-# export SMTP_USERNAME
-
-# # send exception notifications to a slack incoming webhook
-# export SLACK_EN_WEBHOOK_URL
- 
-# ruby garbage collection stuff
-
-export RUBY_GC_TUNE=0 #set to 1 to enable GC test
-export RUBY_GC_TOKEN=4f4380fc9a2857d1f008005a3eb86928
-export RUBY_GC_HEAP_INIT_SLOTS=186426
-export RUBY_GC_HEAP_FREE_SLOTS=559278
-export RUBY_GC_HEAP_GROWTH_FACTOR=1.03
-export RUBY_GC_HEAP_GROWTH_MAX_SLOTS=74570
-export RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=1.4
-export RUBY_GC_MALLOC_LIMIT=32883406
-export RUBY_GC_MALLOC_LIMIT_MAX=69055153
-export RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR=1.68
-export RUBY_GC_OLDMALLOC_LIMIT=32509481
-export RUBY_GC_OLDMALLOC_LIMIT_MAX=68269910
-export RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR=1.4
-
-## find the ENV currently in use in the app using : 
-##   grep -rIso -P "(?<=ENV)(\.fetch\(|\[).[A-Z_]+.(\)|\])" 
-
-# for a uniq ordered list of env vars:
-##   grep -rIsoh -P "(?<=ENV)(\.fetch\(|\[).[A-Z_]+.(\)|\])" | grep -oP "[A-Z_]+" | sort -u > temp 
-

.gitignore

@@ -4,32 +4,20 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile ~/.gitignore_global
 
-#assety stuff
-public/assets
-public/metamaps_mobile
-public/api/index.html
-vendor/
-node_modules
-npm-debug.log
-app/assets/javascripts/webpacked
-
-#secrets and config
-.env
-*.swp
+realtime/node_modules
+config/database.yml
+#public/assets
 
 # Ignore bundler config
 .bundle
 
+# Ignore the default SQLite database.
+db/*.sqlite3
+
 # Ignore all logfiles and tempfiles.
 log/*.log
 tmp
-.tmp
-
-coverage
 
 .DS_Store
-*/.DS_Store
-.DS_Store?
+
 .vagrant
-gentle/
-startserver.sh

.nvmrc

@@ -1 +0,0 @@
-6.2.2

.rspec

@@ -1,2 +0,0 @@
---color
---require spec_helper

.rubocop.yml

@@ -1,29 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.3
-  Exclude:
-    - 'db/**/*'
-    - 'tmp/**/*'
-    - 'bin/**/*'
-    - 'vendor/**/*'
-    - 'app/assets/javascripts/node_modules/**/*'
-    - 'Vagrantfile'
-
-Rails:
-  Enabled: true
-
-Metrics/LineLength:
-  Max: 120
-
-Metrics/AbcSize:
-  Max: 16
-
-Style/Documentation:
-  Enabled: false
-
-Style/EmptyMethod:
-  EnforcedStyle: expanded
-
-# I like this cop, but occasionally code is more readable without a guard clause,
-# and I don't want to write rubocop:disable comments every time that happens
-Style/GuardClause:
-  Enabled: false

.ruby-gemset

@@ -1 +0,0 @@
-metamaps

.ruby-version

@@ -1 +0,0 @@
-2.3.0

.simplecov

@@ -1,7 +0,0 @@
-if ENV['COVERAGE'] == 'on'
-  SimpleCov.start 'rails' do
-    add_group 'Policies', 'app/policies'
-    add_group 'Services', 'app/services'
-    add_group 'Serializers', 'app/serializers'
-  end
-end

.travis.yml

@@ -1,25 +0,0 @@
-sudo: false
-language: ruby
-cache:
-  bundler: true
-  directories:
-  - app/assets/javascripts/node_modules
-rvm:
-  - 2.3.0
-before_script:
-  - echo "Rspec setup"
-  - export RAILS_ENV=test
-  - cp .example-env .env
-  - bundle exec rake db:create
-  - bundle exec rake db:schema:load
-  - echo "node setup"
-  - . $HOME/.nvm/nvm.sh
-  - nvm install stable
-  - nvm use stable
-  - npm install --no-optional
-script:
-  - bundle exec rspec && bundle exec brakeman -q -z && npm test
-addons:
-  code_climate:
-    repo_token: 479d3bf56798fbc7fff3fc8151a5ed09e8ac368fd5af332c437b9e07dbebb44e
-  postgresql: "9.4"

CONTRIBUTING.md

@@ -0,0 +1,93 @@
+# Contributing to Metamaps
+
+Active involvement from the community is essential to help make Metamaps as beneficial for communities as it can be. You can help by reporting bugs, fixing bugs, adding features, contributing new modules and by providing feedback.
+
+
+## Reporting bugs and other issues
+
+If you think you've encountered a bug, do the following:
+
+1. Make sure you are working with the latest version of the Metamaps `master` branch.
+2. Browse through the [issues][metamaps-issues] to check if
+   anyone else has already reported. If someone has, feel free to add more
+   information to that issue to help us solve it.
+3. If no one has yet submitted the issue you are encountering, add it in! Please be sure
+   to include as much information as possible, include errors, warnings,
+   screenshots, links to a video showing the problem or code that can reproduce
+   the issue.
+
+
+## Contributing code
+
+Metamaps is made possible by open source
+contributors like you. We're very interested in getting help from the greater
+community, but before you start it's important that you become acquainted with
+our workflow. Following these guidelines below will make collaboration much
+smoother and increase the chances that we will accept your pull request without
+hiccups.
+
+
+### Development Process
+
+Our development process is very similar to the approach
+described in the well-known article [A Successful Git Branching Model by Vincent
+Driessen][git-branching-model]. Here's an overview:
+
+* Our `master` branch is the branch upon which 
+  Metamaps developers should be basing their work on. The `master` branch is not guaranteed to be stable.
+* All commits intended for `master` should take place on your own personal
+  fork, and be submitted via pull request when ready.
+* Only maintainers can accept pull requests from forks into the core Metamaps.cc
+  repository.
+* Please squash your commits into a single commit before making a pull request.
+
+### Getting started
+
+1. Make sure you have a [GitHub account](https://github.com/signup/free)
+2. [Fork metamaps][fork-metamaps]
+3. Keep your fork up to date. Metamaps is a fast moving project, and things are
+   changing all the time. It's important that any changes you make are based on
+   the most recent version of metamaps, since it's possible that something may
+   have changed that breaks your pull request or invalidates its need.
+4. Make sure you have a [Contributor License Agreement](http://caa.metamaps.cc) on file.
+5. Read on ...
+
+
+### Contributor License Agreement
+
+Before we can accept any contributions to Metamaps, we first require that all
+individuals or companies agree to our Contributor License Agreement (CLA). The e-mail
+address used in the pull request will be used to check if a CLA has already been
+filed, so be sure to list all email addresses that you might use to submit your
+pull requests when filling it out. Our CLA can be found [here](http://caa.metamaps.cc).
+
+### Testing and Linting
+
+TODO
+
+
+### Branch grouping tokens
+
+All pull requests submitted to Metamaps.cc should occur on a new branch. For these
+branches, we at metamaps use a short token indicating the nature of the branch in
+question followed by a solidus (`/`) and a kebab-cased string describing the
+branch. We are using the following tokens:
+**NOTE: Not sure the above is right, but also not sure what to change it to **
+
+    bug   // bug fixes
+    wip   // work in progress
+    feat  // feature
+
+Bug fixes follow a [slightly different format](#bug-fixes).
+
+### Bug fixes
+
+If you'd like to contribute a fix for a bug you've encountered, first read up on
+[how to report a bug](#reporting-bugs-and-other-issues) and report it so we are
+aware of the issue. By filing the issue first, we may be able to provide you
+with some insight that guides you in the right direction.
+
+[metamaps-issues]: https://github.com/metamaps/metamaps_gen002/issues
+[git-branching-model]: http://nvie.com/posts/a-successful-git-branching-model/
+[fork-metamaps]: https://github.com/metamaps/metamaps_gen002/fork
+[cla]: http://metamaps.cc/cla

Gemfile

@@ -1,57 +1,59 @@
-# frozen_string_literal: true
-
 source 'https://rubygems.org'
-ruby '2.3.0'
+ruby '2.1.3'
 
-gem 'rails', '~> 5.0.0'
+gem 'rails', '3.2.17'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'active_model_serializers'
-gem 'aws-sdk', '~> 2.7.0'
-gem 'best_in_place'
-gem 'delayed_job'
-gem 'delayed_job_active_record'
 gem 'devise'
-gem 'doorkeeper'
-gem 'dotenv-rails'
-gem 'exception_notification'
-gem 'httparty'
-gem 'json'
-gem 'kaminari'
-gem 'mailboxer'
-gem 'paperclip'
+gem 'redis'
 gem 'pg'
-gem 'puma'
-gem 'pundit'
-gem 'pundit_extra'
-gem 'rack-attack'
-gem 'rack-cors'
-gem 'redis', '~> 3.3.3'
-gem 'slack-notifier'
-gem 'snorlax'
-gem 'sucker_punch'
+gem 'cancan'
+gem 'formula'
+gem 'formtastic'
+gem 'json'
+gem 'rails3-jquery-autocomplete'
+gem 'best_in_place' #in-place editing
+gem 'kaminari' # pagination
+gem 'uservoice-ruby'
 
-# asset stuff
-gem 'jquery-rails'
-gem 'jquery-ui-rails'
-gem 'sass-rails'
-gem 'uglifier'
+gem 'paperclip'
+gem 'aws-sdk'
 
-group :test do
-  gem 'brakeman', require: false
-  gem 'factory_bot_rails'
-  gem 'json-schema'
-  gem 'rspec-rails'
-  gem 'shoulda-matchers'
-  gem 'simplecov', require: false
+#gem 'therubyracer' #optional
+#gem 'rb-readline'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer'
+
+  gem 'uglifier', '>= 1.0.3'
 end
 
-group :development, :test do
-  gem 'better_errors'
-  gem 'binding_of_caller'
-  gem 'faker'
-  gem 'pry-byebug'
-  gem 'pry-rails'
-  gem 'rubocop', '~> 0.48.1' # match code climate https://github.com/tootsuite/mastodon/issues/1758
-  gem 'timecop'
-  gem 'tunemygc'
+group :production do #this is used on heroku
+ #gem 'rmagick'
 end
+
+gem 'jquery-rails', '2.1.2'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+ gem 'jbuilder', '0.8.2'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
+

Gemfile.lock

@@ -1,350 +1,181 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.5)
-      actionpack (= 5.0.5)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.5)
-      actionview (= 5.0.5)
-      activesupport (= 5.0.5)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.5)
-      activesupport (= 5.0.5)
-      builder (~> 3.1)
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.6)
-      actionpack (>= 4.1, < 6)
-      activemodel (>= 4.1, < 6)
-      case_transform (>= 0.2)
-      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
-    activejob (5.0.5)
-      activesupport (= 5.0.5)
-      globalid (>= 0.3.6)
-    activemodel (5.0.5)
-      activesupport (= 5.0.5)
-    activerecord (5.0.5)
-      activemodel (= 5.0.5)
-      activesupport (= 5.0.5)
-      arel (~> 7.0)
-    activesupport (5.0.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (7.1.4)
-    ast (2.3.0)
-    aws-sdk (2.7.0)
-      aws-sdk-resources (= 2.7.0)
-    aws-sdk-core (2.7.0)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.7.0)
-      aws-sdk-core (= 2.7.0)
-    aws-sigv4 (1.0.2)
-    bcrypt (3.1.11)
-    best_in_place (3.1.1)
-      actionpack (>= 3.2)
-      railties (>= 3.2)
-    better_errors (2.3.0)
-      coderay (>= 1.0.0)
-      erubi (>= 1.0.0)
-      rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
-    brakeman (3.7.2)
-    builder (3.2.3)
-    byebug (9.1.0)
-    carrierwave (1.1.0)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
-    case_transform (0.2)
-      activesupport
-    climate_control (0.2.0)
-    cocaine (0.5.8)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    aws-sdk (1.54.0)
+      aws-sdk-v1 (= 1.54.0)
+    aws-sdk-v1 (1.54.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+    bcrypt (3.1.7)
+    bcrypt (3.1.7-x86-mingw32)
+    best_in_place (2.1.0)
+      jquery-rails
+      rails (~> 3.1)
+    builder (3.0.4)
+    cancan (1.6.10)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    debug_inspector (0.0.3)
-    delayed_job (4.1.3)
-      activesupport (>= 3.0, < 5.2)
-    delayed_job_active_record (4.1.2)
-      activerecord (>= 3.0, < 5.2)
-      delayed_job (>= 3.0, < 5)
-    devise (4.3.0)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
+    devise (3.4.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 3.2.6, < 5)
       responders
-      warden (~> 1.2.3)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    doorkeeper (4.2.6)
-      railties (>= 4.2)
-    dotenv (2.2.1)
-    dotenv-rails (2.2.1)
-      dotenv (= 2.2.1)
-      railties (>= 3.2, < 5.2)
-    erubi (1.6.1)
-    erubis (2.7.0)
-    exception_notification (4.2.2)
-      actionmailer (>= 4.0, < 6)
-      activesupport (>= 4.0, < 6)
-    execjs (2.7.0)
-    factory_bot (4.8.2)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
-      railties (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
-    ffi (1.9.18)
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    httparty (0.15.6)
-      multi_xml (>= 0.5.2)
-    i18n (0.9.3)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.3.1)
-    jquery-rails (4.3.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
-    json (2.1.0)
-    json-schema (2.8.0)
-      addressable (>= 2.4)
-    jsonapi-renderer (0.1.3)
-    kaminari (1.0.1)
-      activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.0.1)
-      kaminari-activerecord (= 1.0.1)
-      kaminari-core (= 1.0.1)
-    kaminari-actionview (1.0.1)
-      actionview
-      kaminari-core (= 1.0.1)
-    kaminari-activerecord (1.0.1)
-      activerecord
-      kaminari-core (= 1.0.1)
-    kaminari-core (1.0.1)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    mailboxer (0.15.1)
-      carrierwave (>= 0.5.8)
-      rails (>= 5.0.0)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mimemagic (0.3.2)
-    mini_portile2 (2.3.0)
-    minitest (5.11.1)
-    multi_xml (0.6.0)
-    nio4r (2.1.0)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    orm_adapter (0.5.0)
-    paperclip (5.2.0)
-      activemodel (>= 4.2.0)
-      activesupport (>= 4.2.0)
-      cocaine (~> 0.5.5)
-      mime-types
-      mimemagic (~> 0.3.0)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    pg (0.21.0)
-    powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.5.0)
-      byebug (~> 9.1)
-      pry (~> 0.10)
-    pry-rails (0.3.6)
-      pry (>= 0.10.4)
-    public_suffix (3.0.0)
-    puma (3.10.0)
-    pundit (1.1.0)
-      activesupport (>= 3.0.0)
-    pundit_extra (0.3.0)
-    rack (2.0.3)
-    rack-attack (5.0.1)
-      rack
-    rack-cors (1.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.5)
-      actioncable (= 5.0.5)
-      actionmailer (= 5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
-      activemodel (= 5.0.5)
-      activerecord (= 5.0.5)
-      activesupport (= 5.0.5)
-      bundler (>= 1.3.0)
-      railties (= 5.0.5)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.5)
-      actionpack (= 5.0.5)
-      activesupport (= 5.0.5)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.0)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    redis (3.3.3)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    sass (3.5.1)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.6)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    shoulda-matchers (3.1.2)
-      activesupport (>= 4.0.0)
-    simplecov (0.15.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    slack-notifier (2.3.1)
-    slop (3.6.0)
-    snorlax (0.1.6)
-      rails (> 4.1)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sucker_punch (2.0.3)
-      concurrent-ruby (~> 1.0.0)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tilt (2.0.8)
-    timecop (0.9.1)
-    tunemygc (1.0.69)
-    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
-      execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.0)
-    warden (1.2.7)
+      warden (~> 1.2.3)
+    erubis (2.7.0)
+    execjs (2.2.1)
+    ezcrypto (0.7.2)
+    formtastic (3.0.0)
+      actionpack (>= 3.2.13)
+    formula (1.0.1)
+      rails (> 3.0.0)
+    hike (1.2.3)
+    i18n (0.6.11)
+    jbuilder (0.8.2)
+      activesupport (>= 3.0.0)
+    journey (1.0.4)
+    jquery-rails (2.1.2)
+      railties (>= 3.1.0, < 5.0)
+      thor (~> 0.14)
+    json (1.8.1)
+    kaminari (0.16.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    nokogiri (1.6.3.1-x86-mingw32)
+      mini_portile (= 0.6.0)
+    oauth (0.4.7)
+    orm_adapter (0.5.0)
+    paperclip (4.2.0)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
+      mime-types
+    pg (0.17.1)
+    pg (0.17.1-x86-mingw32)
+    polyglot (0.3.5)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
+      bundler (~> 1.0)
+      railties (= 3.2.17)
+    rails3-jquery-autocomplete (1.0.14)
+      rails (>= 3.0)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.3.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    redis (3.1.0)
+    responders (1.1.1)
+      railties (>= 3.2, < 4.2)
+    sass (3.4.5)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.41)
+    uglifier (2.5.3)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    uservoice-ruby (0.0.11)
+      ezcrypto (>= 0.7.2)
+      json (>= 1.7.5)
+      oauth (>= 0.4.7)
+    warden (1.2.3)
       rack (>= 1.0)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
-  active_model_serializers
-  aws-sdk (~> 2.7.0)
+  aws-sdk
   best_in_place
-  better_errors
-  binding_of_caller
-  brakeman
-  delayed_job
-  delayed_job_active_record
+  cancan
+  coffee-rails (~> 3.2.1)
   devise
-  doorkeeper
-  dotenv-rails
-  exception_notification
-  factory_bot_rails
-  faker
-  httparty
-  jquery-rails
-  jquery-ui-rails
+  formtastic
+  formula
+  jbuilder (= 0.8.2)
+  jquery-rails (= 2.1.2)
   json
-  json-schema
   kaminari
-  mailboxer
   paperclip
   pg
-  pry-byebug
-  pry-rails
-  puma
-  pundit
-  pundit_extra
-  rack-attack
-  rack-cors
-  rails (~> 5.0.0)
-  redis (~> 3.3.3)
-  rspec-rails
-  rubocop (~> 0.48.1)
+  rails (= 3.2.17)
+  rails3-jquery-autocomplete
+  redis
   sass-rails
-  shoulda-matchers
-  simplecov
-  slack-notifier
-  snorlax
-  sucker_punch
-  timecop
-  tunemygc
-  uglifier
-
-RUBY VERSION
-   ruby 2.3.0p0
-
-BUNDLED WITH
-   1.16.1
+  uglifier (>= 1.0.3)
+  uservoice-ruby

MacInstallation.md

@@ -0,0 +1,42 @@
+If you are doing an upgrade and or recent pull for changes you will need to change your default ruby package from 2.1.1 to ruby 2.1.2
+
+install homebrew
+
+    \curl -sSL https://get.rvm.io | bash -s stable --rails
+
+    rvm install 2.1.3 --with-gcc=clang
+
+    rvm use 2.1.3
+
+    gem install lunchy 
+
+(http://www.moncefbelyamani.com/how-to-install-postgresql-on-a-mac-with-homebrew-and-lunchy/)
+
+
+    brew install postgresql
+    ln -sfv /usr/local/opt/postgresql/*.plist ~/Library/LaunchAgents
+    createuser metamaps -P -s -d
+
+set a password
+
+    lunchy start postgres
+
+
+cd into the metamaps directory
+
+    bundle install
+
+
+copy the database.yml.default file and rename it database.yml
+make sure the username and password match the POSTGRES username and password you set
+
+
+http://nodejs.org/ hit install, download, open, install
+
+
+    rake db:create
+    rake db:schema:load
+    rake db:fixtures:load
+    rails s 
+    
+( to start the server) 

Procfile

@@ -1,3 +1 @@
-web: bundle exec puma -p $PORT
-worker:  bundle exec rake jobs:work
-
+web: bundle exec rails server -p $PORT

README.md

@@ -1,62 +1,77 @@
 Metamaps
 =======
 
-[![Build Status](https://travis-ci.org/metamaps/metamaps.svg?branch=develop)](https://travis-ci.org/metamaps/metamaps)
-[![Code Climate](https://codeclimate.com/github/metamaps/metamaps/badges/gpa.svg)](https://codeclimate.com/github/metamaps/metamaps)
+[![Join the chat at https://gitter.im/metamaps/metamaps_gen002](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/metamaps/metamaps_gen002?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-## What is Metamaps?
+Welcome to the Metamaps GitHub repo. 
 
-Metamaps is a free and open-source technology for changemakers, innovators, educators and students. It enables individuals and communities to build and visualize their shared knowledge and unlock their collective intelligence.
+## About
 
-You can find a version of this software running at [metamaps.cc][site-beta], where the technology is being tested in an open beta.
+Metamaps is a free and AGPL open source technology for changemakers, innovators, educators and students. It enables individuals and communities to build and visualize their shared knowledge and unlock their collective intelligence. You can find out about more about the project at the [blog][site-blog].
 
-Metamaps is developed and maintained by a distributed, nomadic community comprised of technologists, artists and storytellers. You can get in touch by using whichever of these channels you prefer:
+You can find a version of this software running at [metamaps.cc][site-beta], where the technology is being tested in a private beta.
 
-## How do I learn more?
-     
-- Contact: [team@metamaps.cc](mailto:team@metamaps.cc) or [@metamapps](https://twitter.com/metamapps) on Twitter
-- User Documentation: [docs.metamaps.cc](https://docs.metamaps.cc)
-- User Community: [hylo.com/c/metamaps](https://www.hylo.com/c/metamaps)
-- To see what we're developing, or to weigh in on what you'd like to see developed, see our [Metamaps Feedback and Features](https://trello.com/b/uFOA6a2x/metamaps-feedback-feature-ideas-requests) board on trello
-- To follow along with, or contribute,to our design process, see our [Metamaps Design](https://trello.com/b/8HlCikOX/metamaps-design) board on trello
-- To follow along with, or contribute to, our development process, see our [Github Issues and Pull Requests](https://github.com/metamaps/metamaps/issues)
-- Request an invite to the open beta [here](https://metamaps.cc/request)
+Metamaps is created and maintained by a distributed, nomadic community comprised of technologists, artists and storytellers. You can get in touch with us at team@metamaps.cc or @metamapps on twitter. 
 
-<!-- markdown hack to split two lists -->
+To get connected with the community interested in Metamaps, join our [Google+ community][community].
+
+## Installation
+
+If you are on Mac or Ubuntu you can use the following instructions to quickly get a local copy of metamaps up and running using a Vagrant virtualbox. Don't be intimidated, it's easy!
+```
+git clone git@github.com:metamaps/metamaps_gen002.git
+```
+Now ensure you have VirtualBox and Vagrant installed on your computer
+```
+cd metamaps_gen002
+./configure.sh
+```
+This will do all the setup steps to make Metamaps work with a bit of behind the scenes ninja magick.
+
+To start servers which will run metamaps you can then run:
+```
+./bin/start
+```
+To stop them:
+```
+./bin/stop
+```
+With your webservers running, open a web browser and go to `http://localhost:3000`
+
+You can sign in with the default account
+email: `user@user.com`
+password: `toolsplusconsciousness`
+OR create a new account at `/join`, and use access code `qwertyui`
+
+Start mapping and programming!
+
+While we are still figuring out vagrant for Windows, there is an older set of instructions below
+- [For Windows][windows-installation]
+
+## Contributing
+
+Cloning this repository directly is primarily for those wishing to contribute to our codebase. Check out our [contributing instructions][contributing] to get involved. 
+
+## Community
 
-- To send us a personal message get in touch with us via email, Twitter, or Hylo
 - If you would like to report a bug, please check the [issues][contributing-issues] section in our [contributing instructions][contributing].
-- If you would like to get set up as a developer, that's great! Read on for help getting your development environment set up.
-
-## Installation for local use or development of Metamaps
-
-First off is getting the code downloaded to your computer. You can download a zip file from github, but if you've got `git` you can just run `git clone https://github.com/metamaps/metamaps` in your terminal.
-
-There are instructions for setup on various platforms, with particular support for Mac and Ubuntu, which can be found here:
-- [Mac Install Walkthrough][mac-installation]
-- [Ubuntu Install Walkthrough][ubuntu-installation]
-
-If you prefer to isolate your install in a virtual machine, you may find it simpler to setup using Vagrant:
-- [Vagrant installation][vagrant-installation]
-
-We don't promise support for Windows, but at one point we had it running and we've kept those docs available for reference
-- [Outdated Windows Walkthrough][windows-installation]
+- To participate in discussions and a public forum about Metamaps, join the [Google+ community][community]
+- For contributors, read more instructions in [CONTRIBUTING.md][contributing].
 
 ## Licensing information
-
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or(at your option) any later version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details.
 
 The license can be read [here][license].
 
-Copyright (c) 2017 Connor Turland
+Copyright (c) 2015 Connor Turland
 
+
+[site-blog]: http://blog.metamaps.cc
 [site-beta]: http://metamaps.cc
-[license]: https://github.com/metamaps/metamaps/blob/develop/LICENSE
-[contributing]: https://github.com/metamaps/metamaps/blob/develop/doc/CONTRIBUTING.md
-[contributing-issues]: https://github.com/metamaps/metamaps/blob/develop/doc/CONTRIBUTING.md#reporting-bugs-and-other-issues
-[mac-installation]: https://github.com/metamaps/metamaps/blob/develop/doc/MacInstallation.md
-[ubuntu-installation]: https://github.com/metamaps/metamaps/blob/develop/doc/UbuntuInstallation.md
-[vagrant-installation]: https://github.com/metamaps/metamaps/blob/develop/doc/VagrantInstallation.md
-[windows-installation]: https://github.com/metamaps/metamaps/blob/develop/doc/WindowsInstallation.md
+[community]: https://plus.google.com/u/0/communities/115060009262157699234
+[license]: https://github.com/metamaps/metamaps_gen002/blob/master/LICENSE
+[contributing]: https://github.com/metamaps/metamaps_gen002/blob/master/CONTRIBUTING.md
+[contributing-issues]: https://github.com/metamaps/metamaps_gen002/blob/master/CONTRIBUTING.md#reporting-bugs-and-other-issues
+[windows-installation]: https://github.com/metamaps/metamaps_gen002/blob/master/WindowsInstallation.md

Rakefile

@@ -1,6 +1,4 @@
 #!/usr/bin/env rake
-# frozen_string_literal: true
-
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

UbuntuInstallation.md

@@ -0,0 +1,114 @@
+Firstly this walkthrough is done with a 14.04 32bit install of Ubuntu.
+
+All commands that I could are terminal based.
+
+Lets check if all updates for the system are installed first
+
+in terminal type
+
+    sudo apt-get update
+
+now we need to install git
+
+    sudo apt-get install git
+
+lets get our RVM installed (Ruby Version Manager) now this is fun because the package you will get from apt-get is outdated.
+
+so we are going to use CURL to get RVM
+
+    sudo apt-get install curl
+
+then lets install RVM with curl like this
+
+    curl -L get.rvm.io | bash -s stable
+
+    PATH=$PATH:$HOME/.rvm/bin
+
+    [[ -s "$HOME/.profile" ]] && source "$HOME/.profile"
+
+    [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+
+    source ~/.rvm/scripts/rvm
+
+now we can actually install RVM
+
+    rvm requirements
+
+running this will check your system for requirements as well so you will need to put your system password in.
+
+alright now we can download metamaps from the master using git
+
+    git clone https://github.com/metamaps/metamaps_gen002.git
+
+now there is a couple other things we are going to need which is nodejs, postgresql, libpq-dev and redis-server
+
+    sudo apt-get install nodejs
+
+    sudo apt-get install postgresql
+
+    sudo apt-get install libpq-dev
+
+    sudo apt-get install redis-server
+
+Furthermore, if you want to be able to work on profile picture uploading, or use it
+you'll need ImageMagick. On Ubuntu, you can just go find ImageMagick in the Ubuntu Software Centre
+
+Install the specific version of ruby needed this will take some time
+
+    rvm install ruby-2.1.3
+
+Now we also need to rename your database file which is in ./config/database.default.yml to database.yml
+
+now run inside your metamaps_gen002 folder
+
+    bundle install
+
+in your top lvl directory for metamaps this is a lengthy process so you might want to go and make a coffee or something :)
+
+alright now we need to make sure your postgres password is the same as it is listed in the DB file so we are going to set it by
+
+    sudo -u postgres psql
+
+Select postgres like this
+
+    \password postgres
+
+set the password to 3112
+
+Then to quit
+
+    \q
+
+now we can run the rake install and db creation
+
+    rake db:create
+
+    rake db:schema:load
+ 
+    rake db:fixtures:load
+
+Execute the server: 
+    
+    rails s
+
+and dont forget to run the other server for realtime...
+open a new terminal
+navigate to ./realtime and run 
+
+    sudo apt-get install npm
+    npm install
+    nodejs realtime-server.js
+
+Now you're all set enjoy your personal server of metamaps :)
+
+Navigate your browser to localhost:3000 once you have the server running
+
+Sign in with the default account
+
+email: user@user.com
+
+password: toolsplusconsciousness
+
+OR create a new account at /join, and use access code 'qwertyui'
+
+Start mapping and programming!

Vagrantfile

@@ -9,16 +9,14 @@ sudo apt-get install git curl -y
 
 # rvm and ruby
 su - vagrant -c 'curl -sSL https://rvm.io/mpapis.asc | gpg --import -'
-su - vagrant -c 'curl -sSL https://get.rvm.io | bash -s stable --ruby=2.3.0'
+su - vagrant -c 'curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1.3'
 
 # install some other deps
 sudo apt-get install nodejs -y
 sudo apt-get install npm -y
 sudo apt-get install postgresql -y
 sudo apt-get install libpq-dev -y
-
-# get imagemagick
-sudo apt-get install imagemagick --fix-missing
+sudo apt-get install redis-server -y
 
 # Install node
 ln -fs /usr/bin/nodejs /usr/bin/node
@@ -31,15 +29,15 @@ sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '3112';"
 
 SCRIPT
 
-VAGRANTFILE_API_VERSION = '2'
+VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'trusty64'
-  config.vm.box_url = 'http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
+  config.vm.box = "trusty64"
+  config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
   config.vm.network :forwarded_port, guest: 3000, host: 3000
-  config.vm.network :forwarded_port, guest: 5000, host: 5000
-  config.vm.network 'private_network', ip: '10.0.1.11'
-  config.vm.synced_folder '.', '/vagrant', nfs: true
+  config.vm.network :forwarded_port, guest: 5001, host: 5001
+  config.vm.network "private_network", ip: "10.0.1.11"
+  config.vm.synced_folder ".", "/vagrant", :nfs => true
 
-  config.vm.provision 'shell', inline: $script
+  config.vm.provision "shell", inline: $script
 end

WindowsInstallation.md

@@ -0,0 +1,49 @@
+First off, Metamaps runs on Ruby On Rails. Ruby 2.1.3 and Rails 3.2. You'll need to get Ruby and Rails installed on your computer if you don't already have it. Go to here for Ruby http://rubyinstaller.org/downloads/
+
+You'll also need GIT: http://git-scm.com/download/win
+
+It uses postgreSQL 9.2 as a database. You can install that for your computer from here: http://www.enterprisedb.com/products-services-training/pgdownload . During installation you can choose whatever database password you like. Make sure to note it down!
+
+Once you install those, open a 'command prompt with ruby'. 
+
+to install rails
+    gem install rails -v 3.2
+    
+also download node.js, which is also needed http://nodejs.org/download/
+
+Navigate to the folder that you want to download the metamaps files to and run the following: (use your forked git repository address if it's different than this repo. You will also need to go to your Github account settings and add the SSH key that was placed in your clipboard earlier)
+
+    git clone https://github.com/metamaps/metamaps_gen002.git --branch develop
+    cd metamaps_gen002
+  
+Now you're in the main directory. 
+
+Install all the gems needed for Metamaps by running
+
+    bundle install
+
+Setting up the database:
+
+1) Copy /config/database.yml.default and rename the copy to /config/database.yml then edit database.yml with your text editor and set the password to whatever you chose when you set up the PostGres database.
+ 
+2) In a terminal:
+
+    rake db:create
+    rake db:schema:load
+    rake db:fixtures:load
+
+Running the server:
+
+    rails s
+  
+Navigate your browser to localhost:3000 once you have the server running
+
+Sign in with the default account
+
+email: user@user.com
+
+password: toolsplusconsciousness
+
+OR create a new account at /join, and use access code 'qwertyui'
+
+Start mapping and programming!

app/assets/config/manifest.js

@@ -1,7 +0,0 @@
-// eslint-disable spaced-comment
-// JS and CSS bundles
-//= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css
-
-// Other
-//= link_tree ../images