Merged master in to Messages
Messages changes
Merge commits
Message styling progress
Merge branch 'master' into messages
Merge commit
Merge branch 'reservlogic'
Merge reservlogic into master
Transactions page styling - still buggy
merge master into reservlogic
merge master into messages
second option for user show page