Conflicts:
	actifaction/web/templates/base.html
	actifaction/web/views/action.py
Squashed commit of the following:

commit c4b9904da2cf35883e63ae38e21c07706b518b05
Merge: 270e31c 360982f
Author: Mateja Verlic <mateja.verlic@gmail.com>
Date:   Tue Jan 14 12:13:42 2014 -0800

    Merge pull request #34 from naisnouk/master

    profile shows username in index

commit 360982fd9c7162651b71595c8ed0b0470a42c82c
Author: Hana <sitylame@gmail.com>
Date:   Tue Jan 14 15:33:16 2014 +0100

    profile shows username in index

commit 270e31c7a4e3591172d9fbc27bf6602280f6bd4b
Merge: b9358c9 7f02cd7
Author: Mateja Verlic <mateja.verlic@gmail.com>
Date:   Wed Jan 8 13:07:11 2014 -0800

    Merge pull request #33 from Fibiola/master

    profile shows activity of the logged in user

commit 7f02cd7b633ed203f0315a24eb19f73e94518fef
Author: Fibiola <natasha.pristovsek@gmail.com>
Date:   Wed Jan 8 22:07:49 2014 +0100

    profile shows activity of the logged in user

commit c9211a523c9ff41f88425c62ce81c078c882d300
Merge: 38bc04d b9358c9
Author: Fibiola <natasha.pristovsek@gmail.com>
Date:   Wed Jan 8 21:52:23 2014 +0100

    Merge branch 'master' of https://github.com/CodeCatz/actifaction

commit 38bc04d30b4f35da963f54874c1d40c2a58cfc2c
Author: Fibiola <natasha.pristovsek@gmail.com>
Date:   Wed Jan 8 21:52:17 2014 +0100

    modified user profile

commit b9358c9407c8c6525955a135af41b2f12e1fd87f
Merge: 14afebc d3aff80
Author: Mateja Verlic <mateja.verlic@gmail.com>
Date:   Wed Jan 8 12:42:30 2014 -0800

    Merge pull request #32 from naisnouk/master

    add action_index_buttons in index.html

commit d3aff809bfd4412f200cac175170af3d50552345
Author: Hana <sitylame@gmail.com>
Date:   Wed Jan 8 21:29:05 2014 +0100

    add action_index_buttons in index.html

commit 14afebc00adc19b63501e7dd4e8315b1e35de69d
Merge: 7a2f836 bb84008
Author: Mateja Verlic <mateja.verlic@gmail.com>
Date:   Wed Jan 8 12:21:09 2014 -0800

    Merge pull request #31 from sparkica/master

    Added organizer to fixture and uncommented organizer in models.py

commit bb84008bf51a9dd2d734b2bb93c97e8c9d223440
Author: Mateja Verlic <mateja.verlic@gmail.com>
Date:   Wed Jan 8 21:15:00 2014 +0100

    Added organizer to actions