Merge branch 'master' into payments

aleksis/apps/paweljong/filters.py

aleksis/apps/paweljong/forms.py

aleksis/apps/paweljong/menus.py

aleksis/apps/paweljong/migrations/0015_registrationstate.py

...pps/paweljong/migrations/0016_eventregistration_states.py

aleksis/apps/paweljong/models.py

aleksis/apps/paweljong/tables.py

...aweljong/templates/paweljong/event_registration/edit.html

...aweljong/templates/paweljong/registration_state/chip.html

...eljong/templates/paweljong/registration_state/create.html

...aweljong/templates/paweljong/registration_state/edit.html

...aweljong/templates/paweljong/registration_state/list.html

aleksis/apps/paweljong/urls.py

aleksis/apps/paweljong/views.py