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