working on about page
Merge remote-tracking branch 'upstream/master'
merging upstream into upstream
Merge remote-tracking branch 'upstream/master'
Squashed commit of the following:

commit 89423b8b392516c5164d083cec6e04ae9809f63d
Merge: d2f51e8 18aaba5
Author: ercchy <erika@serox.si>
Date:   Tue Apr 15 00:39:08 2014 +0200

    Merge remote-tracking branch 'upstream/master' into nina_master

    Conflicts:
    	static/js/index.js
    	web/templates/pages/index.html

commit d2f51e8b2e8390e67f4627dc31e39265a5360a89
Author: ercchy <erika@serox.si>
Date:   Tue Apr 15 00:37:27 2014 +0200

    styled footer

commit 1dbd9bdeb044c1fd1270b1baff4e94901bb9a8b4
Author: ercchy <erika@serox.si>
Date:   Tue Apr 15 00:21:02 2014 +0200

    adding link to search from top navigation on other sites apart from index

commit fd93f63063bf4ce331fa5f639018c5e73e966cf0
Author: ercchy <erika@serox.si>
Date:   Tue Apr 15 00:05:21 2014 +0200

    working on index

commit 18aaba52710176061630ce013896d22d4c6843aa
Merge: e6b739d 6d23501
Author: Goran Blažič <goranche@me.com>
Date:   Mon Apr 14 23:07:06 2014 +0200

    Merge pull request #176 from Konviser/master

    Add login_required for user_profile view

commit 6d23501f31e82838b9d448d00b08d51510dd0c6b
Author: Konviser <svetsapelova@gmail.com>
Date:   Mon Apr 14 23:04:27 2014 +0200

    Add login_required for user_profile view

commit e6b739d17424ecad7dd72e6b72e2bcd41391e228
Merge: 81bf7a7 aec47c0
Author: Goran Blažič <goranche@me.com>
Date:   Mon Apr 14 22:44:13 2014 +0200

    Merge pull request #175 from Konviser/master

    Redesign  edit user profile page

commit 5bba1a5b5c6f95b709cd919a8953eebed12cc2b0
Author: ercchy <erika@serox.si>
Date:   Mon Apr 14 21:48:46 2014 +0200

    index page styling

commit aec47c02f260aac7081f553e8f07275f5fed7707
Author: Konviser <svetsapelova@gmail.com>
Date:   Mon Apr 14 20:37:34 2014 +0200

    Display message upon profile update

commit c3784654991801c511c3f40e7d751559f5932b65
Author: ercchy <erika@serox.si>
Date:   Mon Apr 14 20:27:16 2014 +0200

    removing imports of fonts that are not used

commit e36b46087ef0ba1ad6303fb95ff9b19ecaf676e0
Author: ercchy <erika@serox.si>
Date:   Mon Apr 14 20:26:22 2014 +0200

    redesigning top navigation

commit b54f974093baf0443b473e856f09806044068b6a
Author: Konviser <svetsapelova@gmail.com>
Date:   Mon Apr 14 20:10:58 2014 +0200

    Modifications to the user profile page

    Add widgets to correctly display form elements, add style to make a
    space between footer and form

commit 6363ef5f4b17d3cd542f783b553e79ab2f334c2b
Author: Konviser <svetsapelova@gmail.com>
Date:   Mon Apr 14 12:18:18 2014 +0200

    Redesign user profile page

commit 2e11d0b49d49044a50d3d300fcc368c6e54404b9
Author: ercchy <erika@serox.si>
Date:   Mon Apr 14 10:55:47 2014 +0200

    Squashed commit of the following:

    commit 70119b19a68f506f0a77ec40c377a7a74a3be177
    Merge: 9a01f08 81bf7a7
    Author: ercchy <erika@serox.si>
    Date:   Mon Apr 14 10:50:06 2014 +0200

        Merge remote-tracking branch 'upstream/master'

    commit 81bf7a7ef5e808636853c7e7888ad35747ed695c
    Merge: 5d3eded 505813a
    Author: Goran Blažič <goranche@me.com>
    Date:   Sun Apr 13 13:47:16 2014 +0200

        Merge pull request #171 from goranche/countrySelect

        select countries (on index page) without page reload

    commit 9a01f089da4bf06f429c133554481e9487678a18
    Merge: 1c5d4d3 5d3eded
    Author: ercchy <erika@serox.si>
    Date:   Sun Apr 13 13:46:09 2014 +0200

        merging upstream into upstream

    commit 505813a073f3171b5f6f49f7e6aec5d182847fe3
    Merge: 3127dd8 5d3eded
    Author: Goran Blažič <goranche@me.com>
    Date:   Sun Apr 13 13:45:55 2014 +0200

        Merge branch 'master' into countrySelect

    commit 5d3ededa12d270801c8a4115db899f47f89fd2cd
    Merge: 192403c 69deff1
    Author: Erika <erika@serox.si>
    Date:   Sun Apr 13 13:42:22 2014 +0200

        Merge pull request #170 from naisnouk/master

        removing add/search/countries from index, changed about, working on all events view

    commit 69deff19f88ca70234966dbf9cfb1c213dfa1448
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Sat Apr 12 16:58:26 2014 +0200

        removed all from urls

    commit 73224ae0f36af9f8bc0d8db5fe5386c1fed80f17
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Sat Apr 12 16:55:51 2014 +0200

        removed geo_location.py and all.html, fixed events.py

    commit 91ca93e08bf26fdda9cdf0eccc68a13008f41edc
    Merge: 23b8973 192403c
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Sat Apr 12 15:56:01 2014 +0200

        Merge remote-tracking branch 'upstream/master'

    commit 192403ca6ef00867ca68cebb773bb5475ef3d1e8
    Merge: 7df35f6 024a3af
    Author: Goran Blažič <goranche@me.com>
    Date:   Sat Apr 12 15:13:08 2014 +0200

        Merge pull request #174 from goranche/master

        Changed instructions so users clone their forked version, not the main repository

    commit 024a3af641b5c56397e077ea02e52e4f816958b1
    Author: Goran Blažič <goranche@me.com>
    Date:   Sat Apr 12 15:11:21 2014 +0200

        Changed instructions so users clone their forked version, not the main repository

    commit 7df35f6d6e24a4aaf6c32d7bfbac23e66b2e27a5
    Merge: 72668c7 f3cdd90
    Author: Alja Isakovic <ialja@me.com>
    Date:   Sat Apr 12 14:53:08 2014 +0200

        Merge pull request #173 from FloorD/patch-1

        Update README.md

    commit f3cdd9005a3af975c9b44533f709075e35b56046
    Author: Floor Drees <floordrees@gmail.com>
    Date:   Sat Apr 12 14:37:29 2014 +0200

        Update README.md

    commit 3127dd825bb968039e1f68beb4b7eec06d098006
    Author: Goran Blažič <goranche@me.com>
    Date:   Thu Apr 10 10:17:05 2014 +0200

        Revert "Fixed code so maps zooms to IP detected country"

        This reverts commit 3ffebfb2dd479a51bf5ab619a51faead2737df19.

    commit 3ffebfb2dd479a51bf5ab619a51faead2737df19
    Author: Goran Blažič <goranche@me.com>
    Date:   Wed Apr 9 23:45:20 2014 +0200

        Fixed code so maps zooms to IP detected country

    commit 04747a81114e4a10bed353054b1632ee853070fa
    Author: Goran Blažič <goranche@me.com>
    Date:   Wed Apr 9 23:33:07 2014 +0200

        Index page checks for hash in URL and zooms appropriate country, still checks for server set country if hash is not set

    commit 3f9b46cea410d3c2d6168206d540fef1489c36be
    Author: Goran Blažič <goranche@me.com>
    Date:   Wed Apr 9 23:05:37 2014 +0200

        Zoom (without reload) sets country name as well

    commit ff103f77d942417335c809015db0a990e10113f1
    Author: Goran Blažič <goranche@me.com>
    Date:   Wed Apr 9 22:51:39 2014 +0200

        Zoom to selected country without reloading

    commit 23b897325059aa6bf5469969ff4614abb764e103
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Wed Apr 9 20:40:35 2014 +0200

        removing add/search/countries from index, changed about, working on all events view

    commit 72668c76a88682d606b74208935d80200014d74b
    Merge: fd3fabe 544a10e
    Author: Erika <erika@serox.si>
    Date:   Wed Apr 9 18:31:38 2014 +0200

        Merge pull request #167 from goranche/master

        Disabling timezone use

    commit 544a10e253bfc3933cbad4d88a00ce8c0bfcbbc6
    Author: Goran Blažič <goranche@me.com>
    Date:   Wed Apr 9 18:26:35 2014 +0200

        Disabling timezone use

    commit 2dd0d5764932ebb1131992a92a51250660aef741
    Merge: cf7712d fd3fabe
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Wed Apr 9 14:21:49 2014 +0200

        Merge remote-tracking branch 'upstream/master'

    commit cf7712d7c7558db1729f83331a3d7269da3b7c3a
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Wed Apr 9 14:21:40 2014 +0200

        working on all events view

    commit c7071cb2599b26f50e29b0744df09a8941b94c79
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Wed Apr 9 14:21:08 2014 +0200

        working on all events view

    commit 698836d3c232cc4c095a0d091f983d37239fb7e2
    Merge: f6b9c23 b068e14
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Wed Apr 2 19:14:29 2014 +0200

        Merge remote-tracking branch 'upstream/master'

    commit f6b9c2336016733f1d055048ee937f9c5d49221d
    Merge: 1994b73 d19fea1
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Wed Apr 2 19:13:14 2014 +0200

        syncing with master

    commit 1994b7332839703f247ec693ed129296f2243813
    Author: naisnouk <naisnouk@gmail.com>
    Date:   Mon Mar 31 12:09:54 2014 +0200

        new datetimepicker

commit b7de37b489bcc521182663a12f18b436f9952b19
Merge: 195cd15 81bf7a7
Author: Konviser <svetsapelova@gmail.com>
Date:   Mon Apr 14 09:11:38 2014 +0200

    merge master branch with changes to edit profile page

commit 195cd155ec41fc06d12d2d9dea513fa6d3e142dd
Author: Konviser <svetsapelova@gmail.com>
Date:   Mon Apr 14 08:10:14 2014 +0200

    design modifications to the user profile page

commit 61ef94c555dab6a1fbb386e1c4ff6b30e15f0d2f
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 20:24:56 2014 +0200

    working on footer styles

commit 2ae2279cb739a36a58ac3d9a63c387fad8635bea
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 20:18:00 2014 +0200

    working on footer styles

commit e2857eaa7dda8489aece46eb766c24619e246656
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 20:15:08 2014 +0200

    working on footer styles

commit 34ed1648379ad8d07c2474bcbf4eae6054708780
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 16:20:55 2014 +0200

    working on footer styles

commit 3dc74e5c196913864a9f17f9a551f92c2668d3a7
Merge: 773dc7d 88af33f
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 15:36:23 2014 +0200

    Merge branch 'nina_master', remote-tracking branch 'nina/master' into nina_master

commit 88af33ff9b944f3d3589f8ef4c7e73907c68979f
Author: MucaLisa <nina.malovrh@gmx.net>
Date:   Wed Apr 9 15:35:45 2014 +0200

    styling buttons

commit 773dc7d7c4500b94c6ad50cb460e5d438ca8da4e
Merge: 465550a 7f6b82f
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 15:34:34 2014 +0200

    Merge branch 'nina_master', remote-tracking branch 'nina/master' into nina_master

commit 7f6b82f7ca2cb174d30d4d1c08ce222bf5c2b982
Author: MucaLisa <nina.malovrh@gmx.net>
Date:   Wed Apr 9 14:10:19 2014 +0200

    responsive design fix

commit 465550a7f59b681ca3e4b1f75d8781f798ac199d
Merge: cb8e894 c059e32
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 13:52:20 2014 +0200

    Merge branch 'nina_master', remote-tracking branch 'nina/master' into nina_master

commit c059e322da380ec87648c73724e551b180c165b5
Author: MucaLisa <nina.malovrh@gmx.net>
Date:   Wed Apr 9 13:51:54 2014 +0200

    adding viewport and modernizr

commit 47ba788100d2f56a5d19e46f36f73cbb7d5bb326
Author: MucaLisa <nina.malovrh@gmx.net>
Date:   Wed Apr 9 13:50:48 2014 +0200

    adding viewport and modernizr

commit cb8e894519c4afd77f7c8db681654306afeae104
Merge: f653307 db6dae7
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 13:15:41 2014 +0200

    Merge branch 'nina_master', remote-tracking branch 'nina/master' into nina_master

commit db6dae7a7a9f7973fb734af694aa5d85659f0c48
Author: MucaLisa <nina.malovrh@gmx.net>
Date:   Wed Apr 9 13:15:09 2014 +0200

    se macji logo dodan

commit f65330770f5e7efb289e2bcb6729ac73b6db9bc1
Merge: 0aa3876 98d36f8
Author: ercchy <erika@serox.si>
Date:   Wed Apr 9 13:12:49 2014 +0200

    Merge branch 'nina_master', remote-tracking branch 'nina/master' into nina_master

commit 98d36f80ffc50c46313044f09a5f17dc678f6881
Author: MucaLisa <nina.malovrh@gmx.net>
Date:   Wed Apr 9 13:10:47 2014 +0200

    styling footer

commit 0aa3876b77cd3af4d405c100f79b90d1753c6e65
Merge: 1c5d4d3 36242bd
Author: ercchy <erika@serox.si>
Date:   Tue Apr 8 13:02:35 2014 +0200

    Merge branch 'nina_master', remote-tracking branch 'nina/master' into nina_master

commit 36242bd7717f9c36c6d502260453625b6ceea91b
Author: MucaLisa <nina.malovrh@gmx.net>
Date:   Mon Apr 7 18:19:00 2014 +0200

    changing font sucker

commit 5fa8f7c9fa703818c1de1736d3e2e37e634b40d7
Author: MucaLisa <nina.malovrh@gmx.net>
Date:   Mon Apr 7 18:00:11 2014 +0200

    working on new top navigation style
working on topnavigation being responsive
working on topnavigation being responsive
Merge pull request #177 from ercchy/master

Redesign of ...