pagination
Merge pull request #41 from comzeradd/master

Get display_name to Neos
fix typo
New edit profile
Merge pull request #43 from ppapadeas/profile-edit

New edit profile
Merge pull request #42 from comzeradd/pagination

Pagination
Update of copy
Merge pull request #46 from ppapadeas/main-copy

Update of copy
add ID to template
Fix voting for neo objects
Merge pull request #45 from johngian/view-neo

Fix voting for neo objects
Merge pull request #44 from comzeradd/neo-id

Observations designated ID
Static serve fix
fix user bugs
View Neos on index
Merge pull request #47 from comzeradd/static-fix

Static serve fix
Merge pull request #48 from comzeradd/hotfix

Fix user bugs
Fix typo on neo_edit.js
Merge pull request #50 from ppapadeas/edit_neo_css

New edit_neo css and datetimepicker import
Merge branch 'index-neo' of git://github.com/comzeradd/anapneo into comzeradd-index-neo

Conflicts:
	anapneo/neo/views.py