Squashed merge from 'mockup' to 'develop':

commit fbabe9462ecff4f590aef416a964384cb3c47d99
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Jan 9 12:04:31 2013 +0000

    Removed Gemfile.lock

commit f8d2efc137622512c906d8e6d46332a2652721e6
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Jan 9 12:01:15 2013 +0000

    Gemfile stuff

commit a09110001528dd0850443b8888af77b81a219e6a
Merge: 9867d91 b536ed8
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Jan 9 11:43:57 2013 +0000

    Merge branch 'develop' into mockup

    Conflicts:
    	app/assets/javascripts/plazr_store/application.js
    	app/assets/stylesheets/plazr_store/application.css
    	app/controllers/plazr_store/admin/application_controller.rb
    	app/controllers/plazr_store/admin/products_controller.rb
    	app/controllers/plazr_store/application_controller.rb
    	app/controllers/plazr_store/pages_controller.rb
    	app/models/plazr_store/product.rb
    	app/models/plazr_store/variant.rb
    	app/views/layouts/application.html.erb
    	app/views/plazr_store/admin/pages/_form.html.haml
    	app/views/plazr_store/admin/products/_form.html.haml
    	app/views/plazr_store/orders/_details.html.haml
    	app/views/plazr_store/pages/show.html.haml
    	app/views/plazr_store/products/show.html.haml
    	app/views/plazr_store/shared/_nav.html.erb
    	config/routes.rb
    	plazr_store.gemspec

commit 9867d919d5694841ef1c7d15c6e287cfe2342632
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Jan 9 11:11:27 2013 +0000

    Small fix in view admin/products/show

commit d7958f70dd720c9c8b34c8a9879da5062d9ae57d
Merge: 9aab85d d9e098b
Author: Miguel Palhas <mpalhas@gmail.com>
Date:   Wed Jan 9 11:11:41 2013 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit d9e098b5ceba4e7eff8c86e109268f3349b63139
Merge: 01f8daa 5113a7a
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Jan 9 10:58:35 2013 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit 5113a7a85e61b78b4309ef9cba4bbf44d19dfc11
Merge: eaa007d 402e3ad
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Jan 9 10:55:46 2013 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit 402e3ad810fa462a2537cb66aa57013e32e4b1b4
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Jan 9 10:54:40 2013 +0000

    Small fix in view admin/product/show

commit 9aab85d22033170e108815f672937b416a833078
Merge: 0a1b8cb 397870d
Author: Miguel Palhas <mpalhas@gmail.com>
Date:   Wed Jan 9 10:49:02 2013 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit eaa007d014d1e0f2a35e5cd3e7770886be25388b
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Jan 9 10:48:32 2013 +0000

    index page

commit 0a1b8cb5088729e4de4bb20573fc60494e090aeb
Author: Miguel Palhas <mpalhas@gmail.com>
Date:   Wed Jan 9 10:48:00 2013 +0000

    deprecated an old test

commit 567b269c2366818944b1884ae5dd21c9852f36fa
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Jan 9 10:47:28 2013 +0000

    Fixing CSS and JS bug.

commit 01f8daa89553ba5347d6cbe5cb95c6c04512f5ab
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Jan 9 10:23:39 2013 +0000

    search Page: brand filters done

commit 92f05ab72c4acaf0a29f776b5518fe323139016c
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Jan 9 09:57:59 2013 +0000

    search page: external stylesheet works fine

commit 397870d3b6cbe1c800b3814a52452939bfa5dfc6
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Jan 8 23:51:20 2013 +0000

    Progress on Admin Products.

    * Changed form to follow Twitter Bootstrap form-horizontal
    * Added variant properties selection
    * Added image file selection

commit 0f030f261902f012dda9d63278e921d664afaf69
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Tue Jan 8 16:30:27 2013 +0000

    search filters, with css in line

commit a7121f3aac06166dbb7591fe8418f10f03a43974
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Jan 8 15:23:35 2013 +0000

    fixed show and working on user links

commit 315776c390679a1ee2fb9af628e0aeaff84591f8
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Jan 8 15:01:54 2013 +0000

    fixed single and application layout

commit 97495d174a2d605e237239f7e9242244ab9670fe
Merge: e18b0a0 b6b6be0
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Jan 8 13:10:37 2013 +0000

    merged

commit b6b6be009262097497535d71055f44f861c2160a
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Jan 8 11:59:34 2013 +0000

    Fixing errors in views affecting the specs.

commit 1615bb667dcf737daa8930c00a813cea53dc116e
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Jan 8 11:37:37 2013 +0000

    Fixing specs error

commit 293a091ad2d6a8be2d88e26dfbeb4785890783b9
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Jan 8 11:27:11 2013 +0000

    Merged 'develop' into 'mockup'

    Conflicts:
    	app/controllers/plazr_store/admin/application_controller.rb
    	app/controllers/plazr_store/admin/products_controller.rb
    	app/controllers/plazr_store/admin/variants_controller.rb
    	app/controllers/plazr_store/pages_controller.rb
    	app/models/plazr_store/product.rb
    	app/models/plazr_store/variant.rb
    	app/views/layouts/application.html.erb
    	app/views/plazr_store/admin/products/_form.html.haml
    	app/views/plazr_store/admin/variants/_form.html.haml
    	app/views/plazr_store/shared/_nav.html.erb
    	config/routes.rb
    	test/dummy/lib/tasks/populate.rake

commit 0f2d51ba3d22d5a6bff5bde91a043f933c6cdd8e
Author: Pedro Costa <dev@pfac.info>
Date:   Mon Jan 7 14:45:30 2013 +0000

    Fixing functional problems.

    + db:populate working again
    - commented most of topnav (the application layout was breaking with
      plazr_auth
    + added plazr_auth nav (for authentication)

commit bc12d04f9b0ea71da3091677f5d1d7b6a1e118cf
Author: Pedro Costa <dev@pfac.info>
Date:   Mon Jan 7 13:38:37 2013 +0000

    Merging 'develop' into 'mockup'

    Conflicts:
    	app/controllers/plazr_store/admin/products_controller.rb
    	app/controllers/plazr_store/admin/variants_controller.rb
    	app/controllers/plazr_store/pages_controller.rb
    	app/models/plazr_store/product.rb
    	app/models/plazr_store/variant.rb
    	app/views/layouts/application.html.erb
    	app/views/plazr_store/admin/products/_form.html.haml
    	config/routes.rb
    	test/dummy/config/routes.rb

    * => Most conflicts were solved by replacing the old mockup code with the
    * new develop one. Where in doubt, the old version was kept commented
    * for future reference.

commit d741771529c62f87d2c16c658d684be23365289c
Merge: 8ba83e2 4c2b14a
Author: Pedro Costa <dev@pfac.info>
Date:   Sat Jan 5 22:57:00 2013 +0000

    Merge branch 'develop' into mockup

    Conflicts:
    	app/models/plazr_store/product.rb
    	app/views/layouts/application.html.erb
    	app/views/plazr_store/admin/multimedia/_form.html.haml
    	app/views/plazr_store/admin/products/_form.html.haml
    	test/dummy/spec/models/prototype_spec.rb

commit e18b0a068a38747e640cec664d3a5a0dede13cde
Merge: d6fe61b 8ba83e2
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Sat Jan 5 20:27:01 2013 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit d6fe61b44c8332c98ef9335864d6e5c23bc07920
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Sat Jan 5 20:26:52 2013 +0000

    changes

commit 8ba83e284935d0919685eb9333da8c36525e84ce
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Jan 2 19:59:23 2013 +0000

    Admin: Products finished for now

    - Issues remain regarding product categories, variant properties,
      multimedia, etc.

commit c3c70e95d08706b1e96979dece18ba8f181ef3e2
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Jan 2 17:21:14 2013 +0000

    Admin: Products # Edit checkpoint

    + Solved variants hidden fields bug
    + Solved available_at values loading bug

commit 34453775a3e1e7bc2226123d2a4607ef18c5010a
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Jan 2 14:14:48 2013 +0000

    fixed after master variant

commit f359da5d329db8a6dfa209d8024ce2b7f77abe8f
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Jan 2 14:09:26 2013 +0000

    merge fixed

commit fc8c69b457930811938624801d760330e9018c8a
Merge: 71ec84a f5d2aa1
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Jan 2 13:59:28 2013 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit 71ec84a512161296b2776b95b26b8d08cb27a0db
Merge: 943a1dd ac9cc60
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Jan 2 13:59:22 2013 +0000

    merged

commit f5d2aa11ae1c7f3ad1512b059f3a8ed9c1ca1e0a
Merge: 7e84ac1 ac9cc60
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Jan 2 13:55:45 2013 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit 7e84ac1072e554b54f928934db7555de900b5f6c
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Jan 2 13:54:58 2013 +0000

    show page done but without related products

commit 943a1dd9cc5888b0d794777724a8b0573a3144cc
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Jan 2 13:53:32 2013 +0000

    updated

commit ac9cc606b52e6a2ff90237bd0e46e4ea2ee6b29e
Author: Pedro Costa <dev@pfac.info>
Date:   Sun Dec 30 01:58:02 2012 +0000

    Admin: Products # New remade.

    Major changes:
    + Styled for less eye hurting;
    + Added datepicker and timepicker to select the available_at value;
    + Conditional fields for brand and prototype

    TODO:
    * Understand and define a strategy to tackle variant properties
    * Find an easier way to edit the master variant fields

commit 3158c3288f8935d07fd8bac6c5ae2c72d102fa14
Author: Pedro Costa <dev@pfac.info>
Date:   Sat Dec 29 18:06:52 2012 +0000

    Fixed dead links

commit b2d05ebbbe9b6641ae385d5961b2aa0c53b87367
Author: Pedro Costa <dev@pfac.info>
Date:   Sat Dec 29 17:38:23 2012 +0000

    Fixed nil featured product bug (view)

commit 3d16d53ce39309d96211ef942b383f524db946d0
Author: Pedro Costa <dev@pfac.info>
Date:   Sat Dec 29 17:21:23 2012 +0000

    Small fix

commit 135fa2fc0c266e484187d2fe08bd3d687aaad5c8
Author: Pedro Costa <dev@pfac.info>
Date:   Sat Dec 29 17:11:46 2012 +0000

    Small fix to the Product model
    + Forgot a conflict zone before

commit b5ac626b365de87fd9d9eb1ed27d95109bea1611
Author: Pedro Costa <dev@pfac.info>
Date:   Sat Dec 29 16:29:23 2012 +0000

    Merging develop into mockup.
    Conflicts:
    	app/models/plazr_store/product.rb
    	app/views/plazr_store/admin/products/_form.html.haml
    	app/views/plazr_store/admin/products/show.html.haml
    	lib/plazr_store/engine.rb

commit 60f0a4a16e2ee14832ebd0dd4d785368cf8ec2f6
Author: Pedro Costa <dev@pfac.info>
Date:   Thu Dec 27 13:57:49 2012 +0000

    Added Datepicker in to Admin forms

commit 2a486f6fca7754f3d664f10830785ffa97331467
Merge: ffb223c 482aafd
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 26 19:32:29 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

    Conflicts:
    	app/controllers/plazr_store/admin/products_controller.rb
    	app/views/layouts/application.html.erb
    	app/views/layouts/plazr_store/application.html.erb
    	app/views/plazr_store/admin/products/show.html.haml

commit ffb223c475f97ffaaabebb463a61d4bc74871637
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 26 13:42:41 2012 +0000

    Variants management in product show

commit eba3316817144d47a520724e50de55557c71ae7a
Merge: 2cbd374 155658f
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 26 12:47:45 2012 +0000

    merged from develop

commit 2cbd3745d7370e10c812436d60a96ac3243b3311
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Sat Dec 22 23:32:37 2012 +0000

    fixed search layout

commit 5c5dea9212c56c1caf8c98a24966b32c34e1e9ae
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Sat Dec 22 23:10:08 2012 +0000

    implemented search in topbar

commit 482aafd9b609b5509201fac07094c217548e7aa1
Merge: 3d05e07 0e2448c
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Sat Dec 22 22:59:38 2012 +0000

    merged from develop

commit 3d05e0770b0efba18f016b757cb525df880f9692
Merge: d726f98 eeb370f
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Sat Dec 22 22:47:08 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit d726f984ebc9eaf320b057877863469a8870be32
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Sat Dec 22 22:47:01 2012 +0000

    index layout

commit 4d32025e8a9bdd69faa28d3738ae5846b9e19128
Author: Pedro Costa <dev@pfac.info>
Date:   Thu Dec 20 00:24:43 2012 +0000

    Checkpoint, changing Admin layout

commit eeb370f667e2f3b3c81f79ede6832a04097db561
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 19 21:26:47 2012 +0000

    Admin product page grid working responsive

commit 6d162a12f216334ba26af226d3fff6e828c595a4
Merge: 977070a 5373f9a
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 19 17:05:08 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit bda036a4491339c17b79934b01a801981e81ab6f
Merge: 689331e 5373f9a
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 19 16:16:09 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit 689331e5366cf5f2ee746bfc06e9723b6cba67ae
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 19 16:15:59 2012 +0000

    nothing

commit 08f5ba8d6aca54a11c03a701ff0fe045e2614cdd
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 19 15:10:48 2012 +0000

    merged

commit 99265608971d562cf873ceac03a32951d52cdd3b
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 19 14:54:39 2012 +0000

    fixed impots in single page

commit 5373f9a0d4b0fb2c0c379bd71b90abe220dff004
Merge: e9857e6 bf81144
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 19 14:42:57 2012 +0000

    Merge branch 'develop' into mockup

commit e9857e61122eff1a3c18e206541ebc9f2c1a9096
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 19 14:31:34 2012 +0000

    single done

commit 977070a2b9dfecb6478e6fdb57673dce3fbef538
Merge: 5163e36 bf81144
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 19 12:24:44 2012 +0000

    Merge branch 'develop' into mockup

commit 5c9e5d895d8e90f70bf062116775d73ab615ca7a
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 19 12:20:45 2012 +0000

    page single done, but without css

commit 5163e36605c41f59237e6f54a4e7912da4960f0e
Merge: f2dd39a 6755073
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 19 12:09:56 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit f2dd39a5a541ef4f0c202395bae4871ae65d08f0
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Dec 18 19:50:06 2012 +0000

    Functional admin products page

commit 67550730d8a6940b72602173cba81e591645122c
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Tue Dec 18 18:18:13 2012 +0000

    head yield and script in application page

commit ce23f84326ed00248ace872ee53e185f208e4735
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Tue Dec 18 17:42:04 2012 +0000

    test commit

commit 96663a893555c44aceb9c91dc0284b6ffc8f4cf3
Merge: a9fcd2a 95c6f42
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Tue Dec 18 17:39:18 2012 +0000

    conflits resolve

commit a9fcd2a55d309bab5aff67b054ea8b7916260f1c
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Tue Dec 18 17:35:20 2012 +0000

    Slide done

commit 95c6f42b06fb9552ee40ca9c555bfb633dc7b85f
Merge: b712b1f b95ff46
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Dec 18 17:08:06 2012 +0000

    merged

commit 9fa65abee6c619f145c00ab18547bc21d24d78a8
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Tue Dec 18 15:53:24 2012 +0000

    Slide working, withou css

commit b712b1fa2fd2a6466e8026b49081c0d608bda43e
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Dec 18 15:49:08 2012 +0000

    layout and bar done

commit b95ff46eeee21c240a3acc4b7e69e92c38983db5
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Dec 18 15:47:05 2012 +0000

    Working on the admin products page

commit 7c42f7dc7bc734f2137d480c1d7ff9fe995d4527
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Dec 18 15:10:12 2012 +0000

    Removed bugged migration

commit 6deaaceb190588378422135c83077d9ee60c2e32
Merge: c717d71 fb0ccf9
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Dec 18 14:58:39 2012 +0000

    Merge branch 'develop' into binding

    Conflicts:
    	Gemfile.lock
    	app/assets/stylesheets/plazr_store/application.css.scss
    	app/views/layouts/plazr_store/application.html.erb
    	config/routes.rb
    	lib/plazr_store/engine.rb
    	plazr_store.gemspec
    	test/dummy/config/routes.rb

commit c717d7166f6ff31745ead82ff1b3151c1368a5d6
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Dec 18 14:30:25 2012 +0000

    Admin products page

commit b9447bf93a8998b217991fb9bccba7b67d06792a
Author: Pedro Costa <dev@pfac.info>
Date:   Mon Dec 17 17:30:56 2012 +0000

    Stupid front-end issues

commit a85b515853f026289b9c5385fb32cdf66686005a
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Mon Dec 17 16:25:52 2012 +0000

    icon changes

commit 6de3c4a76b38f4e926decda920681533a018d5b6
Merge: b589a06 462035e
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 12 15:33:21 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit b589a0686977479141f269233e8a26c7e8b6afde
Merge: ea5e4eb e6b7b2a
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 12 15:28:46 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit ea5e4ebf5090f4221be8ea883f98346ad4984ad6
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 12 15:28:38 2012 +0000

    updating

commit 462035e08e2983581366c80516d305fd56e657e9
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 12 15:28:30 2012 +0000

    Glyphicon images, more store front page updates

commit e6b7b2a400c8b07825b8c46413927e81208357c3
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 12 15:08:31 2012 +0000

    Added stars and shit

commit 326610bf76acb23a2f1be0174bf2b560680acf16
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 12 14:26:14 2012 +0000

    updated bootstrap

commit 2631e8d1a8cbbd3b5c9dfab52048b3c130b31662
Merge: b46898f 7fef4f0
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 12 14:12:40 2012 +0000

    merged

commit b46898f455a97777868a006e20d53c0231383a8c
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 12 14:11:30 2012 +0000

    working on stuff

commit 7fef4f08d202b287fbc41be6ad1e14fe0ec5b3e7
Merge: 9ae419c 98cd1f3
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 12 14:07:25 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit 9ae419c50fb395cdf80830997b970a68850ec235
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 12 14:06:16 2012 +0000

    Added lorem ipsum dummy text

commit 98cd1f3d990e0cb8a9655870b47f4463918bb0a0
Merge: aa87c7d 1c91e35
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 12 10:58:24 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit aa87c7d4e40e68faad2ddf23a3e8e46aad54b7fb
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 12 10:57:14 2012 +0000

    bootstrap with some errors

commit 1c91e355bff7c8693815f2de2b927667be0aa113
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 12 10:54:54 2012 +0000

    Store front page cleanup

commit 00b9b4cc705ba57984643d818bcd9e8adc6a3d35
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 12 10:53:17 2012 +0000

    Store front page almost ready

commit 785091ee85bf96b33ef20723f0bb7ed5363ca370
Merge: 953b85b 5e054ed
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Sun Dec 9 00:52:09 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit 953b85b9bf43468b3982e46f8c5345d7130a9166
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Sun Dec 9 00:37:39 2012 +0000

    html page research over

commit 5e054edf2aeff6930c73437e861f96ad2677011d
Merge: c340691 f8ce13d
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 5 17:15:56 2012 +0000

    merged

commit c3406914a4a3aed676183012bf7e6d81b8a3b076
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 5 17:14:48 2012 +0000

    profile page

commit f8ce13d207b8249187af354913fdceb72c6b2036
Merge: 5d30331 02fb2b4
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 5 16:22:44 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

    Conflicts:
    	config/routes.rb

commit 5d30331cfcc9207283df53fbf2a7fa8e23a27455
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Dec 5 16:20:41 2012 +0000

    Changes in store page. Added admin page (products).

commit 02fb2b4d77c82a59465b350d564f812807f92d42
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 5 15:31:38 2012 +0000

    some changes in single page

commit 60a231ebde4c7abdd155c6fec24cb949a61e65dc
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 5 15:29:34 2012 +0000

    images

commit c8f6b6c9901d469beb868b6252db7112af7520c0
Merge: 5188d6a 46a8158
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 5 13:49:38 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

commit 5188d6a4465a721cc6e4413dd66b0771f297b4a6
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Dec 5 13:49:27 2012 +0000

    layout update

commit 46a8158a6b1aebcf03a97eabdb1dfc828f610d0c
Merge: bdfafc0 9f21177
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 5 11:48:06 2012 +0000

    Merge branch 'mockup' of https://github.com/Plazr/plazr_store into mockup

commit bdfafc0babfd5c339e4a3812295dbd21710be078
Author: 72MiguelGomes <jmbg.41@gmail.com>
Date:   Wed Dec 5 11:41:26 2012 +0000

    Estrutura base feita

commit 9f2117783aea6367090daa22f788b3b0cb94de97
Merge: e654807 2445000
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Dec 4 15:13:42 2012 +0000

    Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup

    Conflicts:
    	app/views/layouts/plazr_store/application.html.erb

commit e654807a34d4ef357b1b5fe9a4a529e733b42029
Author: Pedro Costa <dev@pfac.info>
Date:   Tue Dec 4 15:09:34 2012 +0000

    Store index markup

commit b4a0a89c7f0716b185d5e12669ae16105972b9d9
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Dec 4 12:08:07 2012 +0000

    routes for admin

commit 383ccde0dafd94f8040af1ae008fa5dd608a0ef5
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Dec 4 11:20:54 2012 +0000

    minor changes

commit 24450002e4a07d694873f792f6bcb958d6c9e7d8
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Nov 28 15:21:13 2012 +0000

    fixed layout to remove markup

commit 6ab1e3a24424b62a09fb59f1b37bc457e52b5ced
Merge: fe3c497 d1f2bcb
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Nov 28 15:00:59 2012 +0000

    Merge branch 'mockup' of github.com:naps62/plazr_store into mockup

commit fe3c497f2f88a193cedf5be047d53540b9fe681e
Author: Pedro Costa <dev@pfac.info>
Date:   Wed Nov 28 15:00:46 2012 +0000

    Added bootstrap and played with the index page

commit d1f2bcb57ed8b86337ff69647377e029bbb81807
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Wed Nov 28 14:29:04 2012 +0000

    added routes views and controllers for single and about page

commit b337770c917e7df4b72a9c3ec24d13b78857fb70
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Nov 27 11:25:30 2012 +0000

    mockups namespace setup with controller and views working

commit 65050945b09f8cfff804ede49b92af2b2df78b8d
Author: Gabriel Poça <gabrielpoca@gmail.com>
Date:   Tue Nov 27 11:06:49 2012 +0000

    added mockups namespace with controller and views