Conflicts:
	badges/static/css/sass/project_page.scss
	badges/static/css/sass/responsive.scss
	badges/templates/base.html
	badges/templates/landing/home.html
	badges/templates/project/create.html
	badges/templates/project/feedback.html
	badges/templates/project/review.html
Squashed commit of the following:

commit 56a41c275f7b08310b9e45bd4dce898f978e38ea
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 15:01:37 2013 +0200

    adding project view on badge view

commit 0b90f1a54c9615982ab9150c1f652c8f9c57d309
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 14:53:31 2013 +0200

    fixed bug that came with merging

commit f641622f050303e1ea2251da169c5f3ff4995cec
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 14:41:35 2013 +0200

    merging master to dashboard-redoing branch

commit 7f3ff8b18519aa5089eb023a39615d0d485973e2
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 14:26:54 2013 +0200

    some responsive design tweaks

commit 2cb19f7ae5ee36bb08bf96835353f32804cde591
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 14:26:20 2013 +0200

    some responsive design tweaks

commit 27a109e92dfdb17ce4d56e4b1260d7df148d715d
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 13:27:53 2013 +0200

    pep8 stuff

commit 174489bf44adfe6bfce5baed2d6ef23320bd4a40
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 13:25:42 2013 +0200

    tweak to the layout on give feedback page

commit 9d14267bf3f16b6a4c5b3b77293fe70136e59d14
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 13:12:35 2013 +0200

    adding feedback list to projects on badge view

commit 123b5fb070e068f5c1d8c87fd3d8f7ac9e1c8734
Author: ercchy <erika@serox.si>
Date:   Mon Oct 7 12:43:07 2013 +0200

    adding feedback list to projects on home page

commit 19d1c48d6438182b2912ec8bd2ae30b442c8bc06
Author: ercchy <erika@serox.si>
Date:   Thu Oct 3 15:56:26 2013 +0200

    working on tests

commit e6b5c72d9f3a821d7a4a77f594a5682d2ac4fdb8
Author: ercchy <erika@serox.si>
Date:   Thu Oct 3 09:58:50 2013 +0200

    refactored maethod to helpers from processors

commit 54d456a3caae95929824a5e6feade78f8849ea91
Author: ercchy <erika@serox.si>
Date:   Wed Oct 2 14:22:33 2013 +0200

    added feedback to all projects that have feedback in dashboard

commit fe3f7da90bb845d0c6571a3a0a801ffb245583dd
Author: ercchy <erika@serox.si>
Date:   Wed Oct 2 14:12:39 2013 +0200

    added feature to watch someone elses dashboard

commit 417cb6e034fe163597b28d625b59251f5803689b
Author: ercchy <erika@serox.si>
Date:   Wed Oct 2 13:58:38 2013 +0200

    added title to dashboard button

commit 6e4861e67dfa3a0338a334cf5b9446eaefe316fe
Author: ercchy <erika@serox.si>
Date:   Wed Oct 2 13:56:45 2013 +0200

    added title to dashboard button

commit 72c832d934988c450a5379e07708ef22e6345ea7
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 23:02:06 2013 +0200

    working on dashboard

commit 3f3df604ff5c7b34f3363c0f7a83dbae86a56564
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 23:01:56 2013 +0200

    working on dashboard

commit 0f1dfd9e2dd5efca04e9d3fb632a7542938b1ded
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 22:59:51 2013 +0200

    adding alerts

commit c6b77bc3c6e29a793589375909dcf52ed2767faf
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 16:09:40 2013 +0200

    fixing button url bug

commit 8afb96f2db64780aa9577859d428eba537954568
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 15:09:09 2013 +0200

    added function to get all projects with feedback from user

commit aac49cddf6c1bcef9e6da6bef87cd6a639df71c6
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 14:32:27 2013 +0200

    added feedback for project

commit 9ed7b16e7772f3da85d1854d78756c6d042264bd
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 14:31:56 2013 +0200

    added function to get all the feedback from user

commit 65845e9df1ef233c92fe0e39f0c64a22a804ef35
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 13:43:21 2013 +0200

    working on dashboard

commit a06892579c92e7b66dde28c5e0e2a3d6cd17bfd7
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 13:28:36 2013 +0200

    added feedback for project

commit 509d39ea23418d3f7afc4c86aae52281bd0aed95
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 12:35:28 2013 +0200

    styling fix

commit 18c515657841f81f638170c20a5b400e8b94d758
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 12:23:24 2013 +0200

    overflow bugfix

commit 90aeb02711464132ca28ee6734ef93067442cdc8
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 12:21:28 2013 +0200

    tab spacing changed

commit 45de06a50b1ea0029999b0acccc8d39e591e3c63
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 12:18:38 2013 +0200

    duplicated html bugfix

commit 528ec43a13dcca49a86b470f42e1815c37d89242
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 11:11:46 2013 +0200

    changed line-height for headings

commit 73845688f8d5f93eddc05d66d54be13cef616166
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 11:08:10 2013 +0200

    working on dashboard

commit 4b3bfa3746ca03911b7bc7fd62c7d6256b94ecfd
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 11:07:51 2013 +0200

    adding badge mini

commit ac6a9cf9ef411b719572c59f6ff69dca192ce2b7
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 11:06:42 2013 +0200

    adding badges to badges section

commit 1fcb2750d3fa48df0431b4dc81504a2cddf466dc
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 11:06:21 2013 +0200

    adding badge mini style

commit ec50f83bbfd0af0575c3e2de08673d075d6e21ea
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 11:06:09 2013 +0200

    adding badge mini style

commit 6a3c5c7af632c2af1e8cf11b88f9f3706480ba2f
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 11:03:09 2013 +0200

    adding badge mini style

commit c6228ead59880aaab0297092db5878e08893e5bf
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 10:26:39 2013 +0200

    changed footer style

commit 2509e67a7b4e20b5ff75170cfc96246a9acd2e86
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 10:22:53 2013 +0200

    changing active class for navigation

commit 98064b6d34d0aa72acea7443662c404e356f61f4
Author: ercchy <erika@serox.si>
Date:   Tue Oct 1 10:11:57 2013 +0200

    working on dashboard

commit 4c1ce95a111aac4662ed6d437fcc2c25140a3619
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 21:11:14 2013 +0200

    working on dashboard

commit 83b5fca80eb2767e0add8d291e11c7188911c009
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:52:21 2013 +0200

    working on dashboard

commit e8c495eb50e824fdb5725133bdf0712d23b8e7f8
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:52:07 2013 +0200

    added url for different view on dashboard

commit 330888414c96b85d16ef574f162865fcee338763
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:51:26 2013 +0200

    refactored media app

commit 44cac3ca8d735b930f44b48b1dc295ec9fabf2ab
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:48:43 2013 +0200

    adding tests for dashboard

commit debefa3b00c0019b5eec3f1993c011cc90078338
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:48:20 2013 +0200

    adding processors file to dashboard

commit 07743822e72e4d1ae62b722c8601f1c3d8f2b940
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:47:59 2013 +0200

    adding tests for dashboard

commit 74d58e71997f4872afca68bccf0d660faf977cd0
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:47:36 2013 +0200

    import modification was done here

commit e25d895da98991dc02a90f4d68bd15fa1d1c1f7f
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:46:28 2013 +0200

    refactored media app

commit 73a3dc68dba446eccdf0497b090e55e3a3df2d0f
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:45:53 2013 +0200

    refactored get_projects_for_that_need_feedback method to be more readable

commit bb7e6f92c52b8e06c26cb5a6d38fbdadc9747445
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:43:59 2013 +0200

    pep8 modification

commit c97cd45804163afefdf5146989c57ce85ba629dd
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:43:34 2013 +0200

    added function to get badges created by user

commit 2585257bfe0044d347f14a5d71d35b5ca842a21a
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:38:17 2013 +0200

    refactored helper just a bit

commit 2f5ab24a2c372ca549285945b8ca4871736a7035
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 13:17:36 2013 +0200

    refactored media app

commit 5b2264bfadb2c2cef8ba93bb71ae9a9307ce6ccc
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 12:32:32 2013 +0200

    added function to get badges created by user

commit 8e85a3a6b67da63a9bc3a96b5e865389c1328c6d
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 11:46:32 2013 +0200

    renamed test

commit 79fb8ad099919724e3998ba4fc31539adfcd01d7
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 11:46:16 2013 +0200

    renamed test

commit 3a85478e5fa97d048cee23985b8bd7c06934c266
Author: ercchy <erika@serox.si>
Date:   Mon Sep 30 11:41:04 2013 +0200

    reformatted ready for feedback function

commit e32e5f4d471cc40f447f27704dc1113bd8168b4e
Author: ercchy <erika@serox.si>
Date:   Fri Sep 27 13:04:16 2013 +0200

    changed line height for h* tags

commit e6a6b32265e82880b90ac7f9e852be79e11e0115
Author: ercchy <erika@serox.si>
Date:   Fri Sep 27 12:50:58 2013 +0200

    added date joined to dict of user

commit c5810403edb78dd058a561aa32c5eefcada7e558
Author: ercchy <erika@serox.si>
Date:   Fri Sep 27 12:49:06 2013 +0200

    refactored template

commit 306b35bbd0bc66cf0d5c7081872a96a759a3def7
Author: ercchy <erika@serox.si>
Date:   Fri Sep 27 12:48:45 2013 +0200

    changed transition time

commit 720df881adc3b2138580b3c55dc0838b0551d821
Author: ercchy <erika@serox.si>
Date:   Fri Sep 27 12:36:02 2013 +0200

    added top navigation for dashboard

commit 27fa8884a742a0bcdedf1aed8db425e11f378488
Author: ercchy <erika@serox.si>
Date:   Fri Sep 27 11:49:14 2013 +0200

    adding mixins

commit da4ee990de0e2e1dfac33ee4309f639ee3ffd471
Author: ercchy <erika@serox.si>
Date:   Fri Sep 27 11:48:52 2013 +0200

    adding mixins

commit 0553264bce8e58d4abe9897141426f83010fd02f
Author: ercchy <erika@serox.si>
Date:   Thu Sep 26 16:53:10 2013 +0200

    working on dashboard

commit 52b97a37d8f8867a5e6d5b71de7c58d9a1f9c12c
Author: ercchy <erika@serox.si>
Date:   Thu Sep 26 14:10:00 2013 +0200

    Conflicts:
    	badges/static/css/sass/responsive.scss
    	badges/templates/landing/home.html
    	badges/templates/project/create.html
    	badges/templates/project/feedback.html
    	badges/templates/project/review.html
    	badges/templates/project/revise.html
    Squashed commit of the following:

    commit f44b62464ede2840860f91754f171b5a9b95c094
    Merge: a005c70 59f167e
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 04:42:17 2013 -0700

        Merge pull request #50 from ercchy/master

        Fixing js bug

    commit 59f167ec0fe64df88360b9cd2308a7a2fbfcce46
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:40:22 2013 +0200

        pep8 thingy ;)

    commit 753fa4e14bbcb8fac5bd7b51cc08db2d2c515ccb
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:40:01 2013 +0200

        removing unneeded parameter for js

    commit 4c48bc2d5445466f385f87cc2c5b0b26b8f9b466
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:38:48 2013 +0200

        adding a semicolon to the end of the script, to prevent error on compressing

    commit 5009112873edb55ba8da04055e8661f3126b2f9c
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:24:20 2013 +0200

        removed parameter that was not required by function

    commit 58b17ad11573b1c4e56e29cb4d4febb47fa38265
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:23:36 2013 +0200

        removing 'require' process

    commit 2d5651179789272c6a65cf2b825d17a1db0195f1
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:21:10 2013 +0200

        removing require process

    commit 5f5a914eb16c2a01aeb8103028e5bfc50b746965
    Merge: bc45458 a005c70
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:19:04 2013 +0200

        Merge branch 'master' of https://github.com/p2pu/badges

    commit bc45458acf8196f8eed97ae2974b6489be4f9c9e
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:18:51 2013 +0200

        removing commented code and fixing indentation

    commit a005c70441d5c66f7ed42a4a7e257a8c36b88b1f
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 13:17:00 2013 +0200

        Update base.html

    commit 06f1dbeab7a3b3d6178cd1123134d3652f24eb5c
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 13:10:57 2013 +0200

        Update base.html

    commit 897814591abe6870898198673e817698a3b28c88
    Merge: f110718 1bf7d06
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 04:08:51 2013 -0700

        Merge pull request #49 from ercchy/master

        Optimizing usage of CKEditor scripts

    commit 2ae40a348268ee2605cfbf6ca3576785ae6c60d5
    Merge: 1bf7d06 f110718
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:07:28 2013 +0200

        Merge branch 'master' of https://github.com/p2pu/badges

    commit 1bf7d065ca6b42dab8f28905335db87e326e4100
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 13:06:41 2013 +0200

        removing ckeditor from base template

    commit 360d214161a78ab449eae4869f9af1364e50e45e
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 12:49:23 2013 +0200

        removing ckeditor from base template

    commit f1107180c7675bd741e4e0398c32b01977bebd89
    Merge: 22275c5 7945066
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 03:40:22 2013 -0700

        Merge pull request #48 from ercchy/master

        adding missing image

    commit 79450660b9ca6efd0cfaa2bf9424846473e28e8c
    Merge: df09edd 22275c5
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 12:39:33 2013 +0200

        trying to find js bug

    commit df09eddfb42e91e8b4858e98daa6afd3e8d4c55c
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 12:38:37 2013 +0200

        adding missing image

    commit 22275c52945aa3fef98e853677b44f3e971f83de
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 12:35:18 2013 +0200

        Update base.html

    commit d43d82a9679235a212503a9bcdf65251d23b7b9f
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 12:30:35 2013 +0200

        Update base.html

    commit ab9e702c0fd6c98fd049dc2eb6f284a8523a8345
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 12:25:37 2013 +0200

        Fixing js bug

    commit a009565e21fa08f7f459f07c3b9a7e71fbb66e69
    Merge: b63672f f2aa610
    Author: Erika <erika@serox.si>
    Date:   Thu Sep 26 03:14:25 2013 -0700

        Merge pull request #47 from ercchy/master

        Bugfixes for the review a Project page

    commit f2aa610f1fdbf47de0f07d2bd530a253805408c9
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 12:10:36 2013 +0200

        bugfix with the sider lib

    commit f34aa1a14f0128f2dd15bcd99d68ba354c7e5080
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 10:49:27 2013 +0200

        changing title for the button browse Badget to apply for Badges

    commit e7279d31aee386ff1b585ae73e81f10ed762bff4
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 10:48:57 2013 +0200

        adding padding to section

    commit 5d6914a6af6c3caa33a335b42ce2c576d85dc42c
    Author: ercchy <erika@serox.si>
    Date:   Thu Sep 26 10:27:42 2013 +0200

        bugfix on a template for review a project

    commit b63672fd749e96736ca1f008c375d98fbbeff259
    Merge: e1a69db b6ca1fe
    Author: Erika <erika@serox.si>
    Date:   Wed Sep 25 02:53:58 2013 -0700

        Merge pull request #46 from ercchy/master

        Editing badge is possible after it is published

commit 656bbf624fda54e6e02fc92235decd4e42b21ed9
Author: ercchy <erika@serox.si>
Date:   Wed Sep 25 15:50:11 2013 +0200

    working on new dashboard

commit b07079d0b8cf0f9e0dc7f12c83c5120d2f8f92f0
Author: ercchy <erika@serox.si>
Date:   Wed Sep 25 14:10:43 2013 +0200

    switched classes around

commit da13b931c4d57267947d3bb0473b8b4b161c8935
Author: ercchy <erika@serox.si>
Date:   Wed Sep 25 14:09:51 2013 +0200

    switched classes around

commit e5e1877e8a28b9b6456aed1a6b51393cf6efdda8
Author: ercchy <erika@serox.si>
Date:   Wed Sep 25 14:08:36 2013 +0200

    removed unused class

commit 751234c541f770a703728ff39b710e521e788636
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 22:56:03 2013 +0200

    working on new dashboard

commit 3039c48de558c2e3e40f5872f862adfdca1ac844
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 22:45:24 2013 +0200

    removed thumbnail padding

commit 3291837c226db354bd4f789bdb0e43c6dd8adb3a
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 22:33:27 2013 +0200

    changing indentation of html in templates

commit 63ee7c063e93452bd3f03138c526ef11b37eeee7
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 22:31:34 2013 +0200

    working on new dashboard

commit dc462a564dced26771b59a5837093b06f3d4e321
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 22:31:24 2013 +0200

    added dates to dict of badge

commit d4014d455a044b1d976085136e1f944c19507dc5
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 21:51:54 2013 +0200

    working on new dashboard

commit 7c67bb76a67c368128077bcb5d3ecfcb3e959c6a
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 21:51:19 2013 +0200

    working on new dashboard

commit 0a212a036cb31dc1a4dbe531ea79de84494c2659
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 21:16:42 2013 +0200

    restyled badge thumbnail on project tile

commit efd72c75b2cf06b6ced6750162350ebca614e720
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 21:15:56 2013 +0200

    added margin to thumbnail class

commit f5151889d644995c5d893669953477f7af4603f6
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 21:15:26 2013 +0200

    restyled badge thumbnail on project tile

commit bef70c2f22b3c8789fb5d0a5fcca3042db956c84
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 20:19:56 2013 +0200

    removed search for project with author uri and badge uri attributes

commit 5ad38d0f1c483da62ece612475ff6f2864a9db99
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 20:14:51 2013 +0200

    added search for project with author uri and badge uri attributes

commit 1ebb759eb9f55c7cda4d630a7167dd2f78049e5b
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 19:31:56 2013 +0200

    working on styling for project tile

commit 134448972bb1db840d2ea417e0e059d1eb4f712e
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 19:03:56 2013 +0200

    working on styling for project tile

commit 2d8473c8d753f4566e3eafb1fa62bcf63133482c
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 18:36:16 2013 +0200

    working on styling for project tile

commit 9a2719a34b22be431bc866bb89818216f7be5c9e
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 18:01:20 2013 +0200

    working on styling for project tile

commit f2a0d1aa61032ce3f2723be0e5143a79d7f3e53a
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:39:40 2013 +0200

    redid processor for retrieving projects ready for feedback

commit 0a5e01df9b228af7f1d408b213abf31a2895d521
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:37:39 2013 +0200

    making better dashboard

    * added badges to projects

commit 39d896459138be446662187f85231e8aa91547ff
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:36:46 2013 +0200

    done some styling and renamed classes for project tile

commit 86aed23cc769158fe359462b6e9cef8b4b68fe56
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:36:04 2013 +0200

    refreshed p2pu framework

commit dea98488d0b5bff84bfd370c4a226e56b8ab1d71
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:35:16 2013 +0200

    added back to top button

commit cec9c9cc2a3089c9080bdfc88c38130b12af0ad6
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:16:18 2013 +0200

    changing styling of project tile

commit 7f63f229a937274b72079cf176c10feb01b171f2
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:15:27 2013 +0200

    changing styling of project tile

commit e080cdd8ee56b9449f9f968d48095190a5b710c7
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:15:14 2013 +0200

    changing styling of project tile

commit 0990ff416d30cbd60f8e235200376a8dc17db0eb
Author: ercchy <erika@serox.si>
Date:   Tue Sep 24 17:14:42 2013 +0200

    adding a overflow class

commit c8198fb6c0db5311f0c8c8446149f8810f71bb65
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 20:56:28 2013 +0200

    working on dashboard

commit fadd9c7b39996611b54bbe8bca612fcb85f295ee
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 15:31:06 2013 +0200

    pep8 align

commit 3ad01ff6b42554ca2b14a8ab5d718c055fb43542
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 13:38:04 2013 +0200

    trying travis with selenium

commit f96006fdd375561ae4eaf87b679bd3fd45e2981b
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 13:31:33 2013 +0200

    trying travis with selenium

commit dfd433f8f13e6b00078192c4ec5cd2665700ad34
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 13:12:06 2013 +0200

    adding selenium testing to dashboard

commit 6539ed3aed3a4b1aa8cc9c07a6544345d9bd21b0
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 12:51:18 2013 +0200

    pep8 align

commit 1f27cd58c4d498bec3bb9002c7078ae0cbe76253
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 12:49:28 2013 +0200

    pep8 align

commit 7d7efecf8120c3fc200355eb81ed8f7ad2e8ab0d
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 12:34:03 2013 +0200

    added selenium to requirements

commit 7b4647d2d344d1ee0ae807c4fdc8ba2e5b893b3b
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 09:30:25 2013 +0200

    new dashboard view

commit e36c54fbe6fa79b1ec071bbb2526a43a74cd2950
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 09:29:54 2013 +0200

    new dashboard styling

commit 54099654afc6c9f26811355432325aca28feb270
Author: ercchy <erika@serox.si>
Date:   Mon Sep 23 09:29:33 2013 +0200

    changed view access

commit be2caab84a1f5dafdf7ecd2121d1f574068454fc
Merge: b85316b b6ca1fe
Author: ercchy <erika@serox.si>
Date:   Thu Sep 19 13:31:02 2013 +0200

    Merge branch 'master' into dashboard-redoing

commit b85316bbb0808ac4e5583eca5a559e45f837869e
Author: ercchy <erika@serox.si>
Date:   Thu Sep 19 13:08:02 2013 +0200

    some styling changes to comply to responsive design
working on tests
fixing mail bug
adding option for login for testing purposes
working on selenium tests
Merge pull request #54 from ercchy/master

New dashboard