Squashed commit of the following:

commit 0c53fafdf6362fde2b5b6cc1266517ef79a95a23
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 15 15:23:47 2014 +1200

    remove textarea width

commit 288ac6ebcfef784194b7595abc569bf5e492e96c
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 15 15:03:23 2014 +1200

    fiddle

commit e471800d66398af078852e685c24de0773b0414d
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 15 14:56:35 2014 +1200

    fiddle

commit 4c1e2d54a46ac81a1c89d7cb40df27aee86ba795
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 15 14:51:32 2014 +1200

    fiddle

commit d3da5d20114026ff7f45839fd10f0c835f71e33f
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 15 14:43:59 2014 +1200

    add webkit specific css

commit 91c807f58504704ec9bbb02c8c9fb56db8e88009
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 15 13:10:48 2014 +1200

    remove margin - did i break somehting while fixing something

commit 363f717e6ae0ff86f0bc544fa73ed04e9a7c1c55
Merge: e339dc7 02a835d
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 15 12:58:23 2014 +1200

    Merge branch 'master' into bootstrap3-upgrade

commit e339dc7618eaa0cec6652f8b16492d7af6272a2c
Merge: 5b4117b edc62c0
Author: Robert Guthrie <rob@guthr.ie>
Date:   Fri Sep 12 15:55:26 2014 +1200

    what am i merging

commit edc62c0499922854e4f1443ee42d766557a130bd
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Sep 12 14:24:25 2014 +1200

    vote form

commit 388a794e3aadfffa17d28723a99aa3ea742d7c53
Merge: a953d26 95c166f
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Sep 12 14:14:49 2014 +1200

    Merge branch 'master' into bootstrap3-upgrade

    Conflicts:
    	db/schema.rb

commit a953d2621dfde13ac2e171848c925cbda41650fc
Merge: b78488a ff46ae1
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Sep 12 14:14:17 2014 +1200

    Merge branch 'bootstrap3-upgrade' of github.com:loomio/loomio into bootstrap3-upgrade

    Conflicts:
    	app/views/votes/_form.html.haml

commit b78488a57d5b6f4392591263b72bcd493731e6fa
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Sep 12 13:24:59 2014 +1200

    vote form

commit ff46ae15304a9989cd12e349d60afe4f0259a3f2
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Sep 12 13:24:59 2014 +1200

    vote form

commit 5b4117b0b0fe8188441ad5c156e57912b658169a
Author: Robert Guthrie <rob@guthr.ie>
Date:   Fri Sep 12 10:41:47 2014 +1200

    remove comment

commit a093c6526880231998a8b3c67a7979fa6ffa9003
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Sep 12 09:32:37 2014 +1200

    datetimepicker positioning

commit 8b342a3063bef3f5eef1995218dfa72e996ceca0
Author: Robert Guthrie <rob@guthr.ie>
Date:   Fri Sep 12 08:43:59 2014 +1200

    timezone needs placement

commit 62f72d6bc69ebae72102c808960832857f924bc1
Author: Robert Guthrie <rob@guthr.ie>
Date:   Thu Sep 11 17:37:08 2014 +1200

    fix datetimepicker

commit 674e6fbb80fa114fabfbc2fac8c1925c83610745
Author: Robert Guthrie <rob@guthr.ie>
Date:   Thu Sep 11 16:35:49 2014 +1200

    fixup bootstrap a bit

commit 34b08166c3764b20b488770eddda07a3c44ac129
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 16:09:41 2014 +1200

    yo dog

commit 415fa14eb0042aff4ed49d7ddccb5f3cbde79fbe
Merge: 3274b9d 5f7b4d3
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 15:19:20 2014 +1200

    Merge branch 'bootstrap3-upgrade' of github.com:loomio/loomio into bootstrap3-upgrade

commit 5f7b4d34ae077c4081c8ffc547f7c93f9fdcf8af
Merge: 52a528b aa8e220
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 8 15:16:49 2014 +1200

    Merge branch 'bootstrap3-upgrade' of github.com:loomio/loomio into bootstrap3-upgrade

commit 52a528b314fe13809be17914c6670ca579b912f4
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 8 15:16:01 2014 +1200

    de fixy

commit 3274b9d986ab8cc7c2517281da9044013b671375
Merge: aa8e220 cff1c25
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 14:57:04 2014 +1200

    Merge branch 'master' into bootstrap3-upgrade

commit 51f32705efe1805668e38e506ab91d161ef30f78
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Sep 8 14:54:43 2014 +1200

    okokokok

commit aa8e22009fbdb5e6a86055243daa5162eb1ac6f3
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 14:48:46 2014 +1200

    marketing css

commit de8b27c751793f77a6d0cad7ccc0fa21fae473b4
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 11:43:37 2014 +1200

    fix front page

commit d6631c06af8b75ccd92012ad29ecdc90b9cc177d
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 11:18:36 2014 +1200

    tweakles

commit 4bbe90cf291aeacb3c466b1636f586cbdc2e9d3d
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 10:56:54 2014 +1200

    fix logged out navbar

commit 2da39dc0e546eed22d2cf10081648d873aabcdda
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 10:29:06 2014 +1200

    fix invitations page

commit 6c9cc4acc062c0db50a6cc651fde457c8abae2c1
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 10:12:07 2014 +1200

    fix navbar

commit ae3baa2f10b3a5d1c5c0718e40546e6f0d7acb8f
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 8 09:43:29 2014 +1200

    fix motions in inbox

commit 5c709b86017a320d744968c0f917199935f3fec1
Author: Richard Bartlett <rich@loomio.org>
Date:   Sat Sep 6 10:19:53 2014 +1200

    wip

commit 0910deb16473dc723123a7ba55db75632d2a44be
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Sep 5 09:42:21 2014 +1200

    center the paginator

commit 2e1311529581b5fdb676d662ca47296ea21dc164
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Sep 5 09:37:04 2014 +1200

    fix new activity dog ear

commit ffbdc67ac671f5fa542cbc1d3417d8a66dcfc25a
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 20:56:41 2014 +1200

    tweak context

commit 9f6c3fe6b06584358f4197ac85b0cf7f40d76ca7
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 20:07:02 2014 +1200

    tweak that bacon

commit 7eabcddf65f33237ccc7e15b14eb7cf12be48d77
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 16:08:38 2014 +1200

    fix help and explore

commit 702f9a835aef5d25e9689e84d1171824f6435bb9
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 12:10:37 2014 +1200

    debugggg

commit 8db1ea1f9fbbf16505285627ecd93a1a77f7134c
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 12:05:40 2014 +1200

    debug

commit 70360e457122800510f4b96f206d36bee3b1cf1d
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 12:01:42 2014 +1200

    debug

commit 6183d55d075408cc3ae48f32d09383137d32af29
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 11:55:01 2014 +1200

    debug

commit 37adccb82102d030b1a900fd256b717bece31c48
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 11:49:40 2014 +1200

    Debug

commit 00a7ce76b2694732b029d4489fc590f749302282
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 11:45:28 2014 +1200

    debug

commit cde561f97a225f990bff28dd01709bac743ee23d
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 4 09:35:17 2014 +1200

    debug

commit 5cfbdfcd73e791ec2102671a2e2f5768e95024bd
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Sep 3 17:39:07 2014 +1200

    debug

commit 77d4e5dbf293e1509faa9f719df6b0021c269956
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Sep 3 17:26:23 2014 +1200

    rebug

commit 1d7fb5679c5e58726050746489b15f375f9d5b60
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Sep 3 17:23:23 2014 +1200

    debug

commit de2ac86b058e6e7f3e2ce15502636c79e16ebce5
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Sep 3 17:08:24 2014 +1200

    doggie

commit 70756b462f3fd57a0ed7842c3cc0d2b04e455179
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Sep 3 15:44:13 2014 +1200

    add labels for tiny screens

commit a55a386d662a1bd8bde7785cd46e67556e309241
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Sep 3 15:01:59 2014 +1200

    make the dropdowns nice

commit 970631a7f4107ef6433a44b82030b673e1cbb761
Merge: 2e94ef8 2ba8803
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Sep 3 11:34:13 2014 +1200

    Merge branch 'master' into bootstrap3-upgrade

    Conflicts:
    	Gemfile.lock
    	app/assets/javascripts/tooltips.js.coffee
    	app/assets/stylesheets/marketing/splash.css.scss
    	app/assets/stylesheets/third_party.css
    	app/assets/stylesheets/unstructured/index.css.scss
    	app/views/application/_inbox.html.haml
    	app/views/groups/memberships/coordinator_index.html.haml
    	app/views/users/profile.html.haml

commit 2e94ef8e998c1c4059dbf1c7fd649ec4f6d2866b
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Sep 3 09:00:21 2014 +1200

    privacy tooltips

commit 39982a3c441602649e1504185b7cefb1fa5000b7
Author: Richard Bartlett <rich@loomio.org>
Date:   Tue Sep 2 17:52:07 2014 +1200

    wippppy

commit 91975b64fd562399f2924116450e79b93061f92b
Author: Richard Bartlett <rich@loomio.org>
Date:   Tue Sep 2 14:58:05 2014 +1200

    simpler than simpleform

commit f2cddcb71eb69f5c17ba1631641cfe08f1be9bc7
Author: Richard Bartlett <rich@loomio.org>
Date:   Tue Sep 2 12:04:43 2014 +1200

    all the things

commit cb4bbe89f429fa8b8853ec7faf0372312ca4b91a
Author: Richard Bartlett <rich@loomio.org>
Date:   Tue Sep 2 10:47:17 2014 +1200

    wup

commit a4711d88a3cc12cf54fdc245fa8634d006850fbc
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 1 18:05:56 2014 +1200

    doing all the things

commit 02312b91c7fbe76054e6e2dbada7db29decfd8ea
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 1 14:23:46 2014 +1200

    dashboard

commit 5b60277eca17f080380ba0c5ecd6eacd545b8f05
Merge: 215292d eaa0311
Author: Richard Bartlett <rich@loomio.org>
Date:   Mon Sep 1 13:30:54 2014 +1200

    Merge branch 'master' into bootstrap3-upgrade

    Conflicts:
    	Gemfile
    	Gemfile.lock
    	app/assets/stylesheets/marketing/splash.css.scss
    	app/assets/stylesheets/unstructured/_dashboard.css.scss
    	app/assets/stylesheets/unstructured/_header.css.scss
    	app/assets/stylesheets/unstructured/_loomio_theme.css.scss
    	app/assets/stylesheets/unstructured/_main.css.scss
    	app/views/application/_groups_dropdown.html.haml
    	app/views/application/_inbox.html.haml
    	app/views/dashboard/_groups.html.haml
    	app/views/dashboard/show.html.haml
    	app/views/devise/registrations/_form.html.haml
    	app/views/groups/show.html.haml
    	app/views/invitations/new.html.haml
    	app/views/pages/third_parties.html.haml
    	app/views/pages/try_it.html.haml
    	app/views/users/email_preferences/edit.html.haml
    	app/views/users/profile.html.haml
    	config/routes.rb

commit 215292ddc22d9bf39f711131329139e882c09039
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Aug 29 10:56:05 2014 +1200

    wip

commit 79ad4b6df87502f90de103df9890f360176d2c44
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Aug 28 17:38:28 2014 +1200

    wip

commit 4a7a3c61c087d62aedada2813f5f47c36c384397
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Aug 28 12:49:02 2014 +1200

    wip

commit 330ac6f1437cebeb806e3f619713350789f2f94f
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Sat Aug 16 20:29:59 2014 +1200

    mobile dashboard

commit bbca459100c0bfc11e04fcb4bde56ebae31fe571
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Fri Aug 15 15:36:05 2014 +1200

    simple form wrapper

commit bd9127c36f96525ca38643a1f670f5474ec57148
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Fri Aug 15 15:30:31 2014 +1200

    simple_form

commit 1e8a0e728371585b4b4ea082aa535c9fe224fc2a
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Fri Aug 15 12:03:43 2014 +1200

    forms

commit 55c1bac9dcc1a5d27141beaab02bb0f2417d6ff6
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Thu Aug 14 17:35:15 2014 +1200

    groups dropdown

commit d26f69ada0cee7eb38a911d5a0097161c8f95912
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Thu Aug 14 17:22:39 2014 +1200

    yuuup

commit fedbfbdf226e445998f4ceb56294306a0c5af48d
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Thu Aug 14 11:25:51 2014 +1200

    fix up simple form

commit c8b44506e01bcb132fe1551fff0d5d570d051025
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Wed Aug 13 21:22:14 2014 +1200

    buttons

commit e8f0d0d2df7e5966b2b6976a14a6b568d16c36cf
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Wed Aug 13 21:16:33 2014 +1200

    sidebars

commit bf25f6db241d2bbea3ded599b34c08d0af326000
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Wed Aug 13 20:37:09 2014 +1200

    dashboard

commit 609765e055f200ac1447f61ae3604f606ec52f4d
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Wed Aug 13 20:24:09 2014 +1200

    wip

commit e29897725ea2571daa69727841e14e30bc403220
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 11 23:29:39 2014 +1200

    ok now it works

commit 2e4df6d175596d73fae02deba388c8c8e1920b3b
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 11 23:26:39 2014 +1200

    add a schema back

commit f953d1bbe200592d1a74b462695ac76a5ceb1761
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 11 21:34:28 2014 +1200

    bundle completed

commit da30e189a6b9f0be3932b99ef2c5d2d2fe3d139f
Merge: 6f76199 bfba65d
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 11 20:35:10 2014 +1200

    merged but have not bundled

commit 6f76199c51c10cefdcca75cb633513076b35992d
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Sat Aug 9 22:37:44 2014 +1200

    update simple_form gem

commit b30981e4ffee8a69924bfa84bbfaa269650ab846
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Sat Aug 9 21:34:21 2014 +1200

    wranglin

commit ace617305aeb733de7b309d784bc33edb2d0c25a
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Sat Aug 9 19:25:38 2014 +1200

    navbar

commit e74f0f8c15f899456898be1653aedc25a9b015b8
Author: Elias <elias.westerberg@gmail.com>
Date:   Tue Jul 22 10:34:23 2014 +0200

    enabled all the stylesheets

commit 1276c8d524085c7938745d663d94342e2764d938
Author: Elias <elias.westerberg@gmail.com>
Date:   Mon Jun 30 17:56:44 2014 +0200

    Z-index solved link issue on resize

commit e90d6d10d91efaa90d6b9fad5326edda95905899
Author: Elias <elias.westerberg@gmail.com>
Date:   Sun Jun 29 20:40:23 2014 +0200

    margins on hands

commit acb8c25b98767e059688262f99136de4268e561d
Author: Elias <elias.westerberg@gmail.com>
Date:   Sun Jun 29 18:53:45 2014 +0200

    attempt fixin thumb-sizes

commit 56313e04682cfead066120dececc838bad6f3a9f
Author: Elias <elias.westerberg@gmail.com>
Date:   Sun Jun 29 18:27:37 2014 +0200

    height

commit 14692ff759992f33a9ecf082e98f486144e1cd31
Author: Elias <elias.westerberg@gmail.com>
Date:   Sun Jun 29 17:59:17 2014 +0200

    gemfile update

commit 90c7ed9f15184b7e3a0b6c1e8924be164707f196
Author: Elias <elias.westerberg@gmail.com>
Date:   Sun Jun 29 17:30:56 2014 +0200

    added sass-gem with version < 3 to avoid known bug

commit f5a70cef5b855d1889196a2c782b2b696d43c9ab
Author: Elias <elias.westerberg@gmail.com>
Date:   Sun Jun 29 17:19:58 2014 +0200

    vote-buttons height=>40px

commit aebc87802e4ceb7c9672113bb0dff1bb950dfa14
Author: Elias <elias.westerberg@gmail.com>
Date:   Sat Jun 28 00:26:49 2014 +0200

    max-width:100em

commit 1359e0bf318902f2b356c06d6ad5d828d39f56a1
Author: Elias <elias.westerberg@gmail.com>
Date:   Sat Jun 28 00:19:58 2014 +0200

    discussion form responsiveness attempt

commit 72ca8c73f0ecdd7e64c29dfce0b35f8593ab476f
Author: Elias <elias.westerberg@gmail.com>
Date:   Fri Jun 27 23:54:24 2014 +0200

    create discussion form fix + misc fixes

commit 91de0271d41db1c0b271745a157f7fbb0724264f
Author: Elias <elias.westerberg@gmail.com>
Date:   Fri Jun 27 22:25:07 2014 +0200

    remove unresponsive css-code

commit 78647a35b84e125c772dc5a58fde6639666253a3
Author: Elias <elias.westerberg@gmail.com>
Date:   Fri Jun 27 20:58:13 2014 +0200

    Layouts got metatag for responsive view

commit d90122bee333b6759907f0ef556d39705afe2b7b
Author: Elias <elias.westerberg@gmail.com>
Date:   Fri Jun 27 20:13:29 2014 +0200

    added metatag for proper mobile rendering

commit 98cf3e2cf8cd87641baacb7279b7d9933d732622
Author: Elias <elias.westerberg@gmail.com>
Date:   Fri Jun 27 16:58:56 2014 +0200

    Collapsable navbar

commit be179099fb19c582ca7f893d768cdb6abd73b557
Author: Elias <elias.westerberg@gmail.com>
Date:   Fri Jun 27 16:39:35 2014 +0200

    Smaller search field in navbar

commit 667794bc6992493885a20ac69de7075ed6981387
Author: Elias <elias.westerberg@gmail.com>
Date:   Thu Jun 26 22:27:38 2014 +0200

    forms also likes boostrap 3

commit f995a11e4a5ca3add2443376b1c37fe394ee4c85
Author: Elias <elias.westerberg@gmail.com>
Date:   Thu Jun 26 21:35:35 2014 +0200

    bootstrap 3 mass-upgrade!

commit b77cc30e6b4333febaa53847a1f96bd87bcfbdc3
Author: Elias <elias.westerberg@gmail.com>
Date:   Thu Jun 26 21:29:20 2014 +0200

    Revert "bootstrap3 migration, tIDENTIFIER error"

    This reverts commit 616962277bfc404bd6456444cfd57efd8d603f6d.

commit fe03a6baa3c5b9e6ca5735fe87a207a31c83a2e9
Merge: 6169622 739bddb
Author: Anders Martini <elias.westerberg@gmail.com>
Date:   Thu Jun 26 01:00:57 2014 +0200

    Merge branch 'master' of github.com:andersmartini/loomio into bootstrap3-upgrade

commit 616962277bfc404bd6456444cfd57efd8d603f6d
Author: Anders Martini <elias.westerberg@gmail.com>
Date:   Thu Jun 26 00:58:29 2014 +0200

    bootstrap3 migration, tIDENTIFIER error

commit 88e23865894d2ba037fc2bbde7ad6a73bdc2948b
Author: Elias <elias.westerberg@gmail.com>
Date:   Wed Jun 25 16:22:41 2014 +0200

    Did some work on sign-in and sign-up

commit fb43357e6da105595b59f7a8465affede5a9c5a6
Author: Elias <elias.westerberg@gmail.com>
Date:   Wed Jun 25 11:17:46 2014 +0200

    moved root route to top

commit 2ced051d145e74be0cff974232c12218ed6812b5
Author: Elias <elias.westerberg@gmail.com>
Date:   Tue Jun 24 00:23:07 2014 +0200

    Minor style fixes

commit 98dc04fa9ab89f2dbe2a4d63527665d42b4683ba
Author: Elias <elias.westerberg@gmail.com>
Date:   Mon Jun 23 23:11:58 2014 +0200

    First take on discussions#show

commit fbe9b931e2f5c9a39b6a6857afdda4215852a685
Author: Elias <elias.westerberg@gmail.com>
Date:   Mon Jun 23 21:45:35 2014 +0200

    Removed require of old bootstrap components

commit 925b0ac2c390a6ca6c4fcb5776e10505cad7d862
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Jun 20 15:52:16 2014 +1200

    fix navbar

commit d30a367c19025f03a0133c763a15cce1e34af823
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Jun 20 14:32:26 2014 +1200

    fix group show page

commit 6840b15ad241829b2f3821e89e4429352565eb2c
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Jun 20 13:21:03 2014 +1200

    set max width

commit d582fb6b1dc99b06fa8adc019422af40f4d9347d
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Jun 20 12:36:38 2014 +1200

    remove inline-block mixin

commit 2906f09b912d35b460d8ef4c57a80db647db5c48
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Jun 20 12:34:19 2014 +1200

    switch out border-radius mixin

commit 2cb2607084be8026a305bfac8d3560b5f4486f5c
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Jun 20 12:34:08 2014 +1200

    install v3

commit 5006951e8d5028f8503e781cb94c544e1db1ac0f
Merge: 91b2c56 43f2431
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Jun 20 12:05:58 2014 +1200

    Merge branch 'master' of github.com:loomio/loomio into bootstrap3-upgrade

commit 91b2c56b8aa7e0f0901a26e9af4fcc76dd3eb5f1
Author: Richard Bartlett <rich@loomio.org>
Date:   Fri Jun 20 09:29:33 2014 +1200

    add bootstrap 3, remove bootstrap 3 subset from marketing site
trying to fix the cukes
fix de cukes
slimmer down
Merge branch 'master' into bootstrap3-upgrade
remove some crazy css
ok
almost there
Fix failing profile deactivate test
Fix failing login spec
fixed update proposal
Merge branch 'bootstrap3-upgrade' of github.com:loomio/loomio into bootstrap3-upgrade
Improve style of group dropdown
Merge branch 'bootstrap3-upgrade' of https://github.com/loomio/loomio into bootstrap3-upgrade
fix invitation form
uncomment
Merge branch 'bootstrap3-upgrade' of github.com:loomio/loomio into bootstrap3-upgrade
Merge branch 'master' into bootstrap3-upgrade

Conflicts:
	app/views/application/_footer_logged_in.html.haml
	app/views/users/profile.html.haml
is this it?
Merge pull request #1543 from loomio/bootstrap3-upgrade

Bootstrap3 upgrade