added read only fields, size of photo column, and link to user
added admin link on album page
added photo date filter
added photo search fileds
added user search fields
added file size filter
pyc conflict
removing pyc
Merge branch 'master' of https://github.com/miracode/django-imagr
Merge branch 'master' of https://github.com/miracode/django-imagr
Partially installed django-registration
Registration sends email now
Merge pull request #10 from miracode/registration

Registration
Merge branch 'master' of https://github.com/miracode/django-imagr
uploaded photo sent to aws
added photo upload functionality
Merge branch 'ui' of https://github.com/miracode/django-imagr into ui
added choose album to photo upload
Merge branch 'ui' of https://github.com/miracode/django-imagr into ui
Hacky hacks serving images from s3