add gender to user; add messages
edit message-views and -controller
New menu, layouting
merge + fix merge conflicts (muntel)
merge + fix merge conflicts
added more model and association tests
AA changes, locked posts, comments for authors books and users arent visible, locked users cant lock in
photoname changed - imprint, contact page and locked screen edited
author_photos displayed in active admin and search_test updated