Merge branch 'master' into front
Merge branch 'hugo' of github.com:Neamar/kingdoms into front
Refactor code organization for api
Refactore code organization, add serializers
First draft for serializers
Refactor login
Update templates
OneToOne for kingdom
Automatically handle dates
Serialize missions
Merge branch 'master' into front
Merge branch 'hugo' of github.com:Neamar/kingdoms into front

Conflicts:
	templates/app/template.html
Load datas from API
First bindings
Data bind for events
First draft for page navigation
Pager navigation
Navigation and partials
Add FirstName, LastName into admin
Merge branch 'master' into front

Conflicts:
	static/app/index.js