fix help question
merge from develop
workaround fix for activeadmin-ransack associations filter
merge develop

evelop'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
add prim d round 2 files
update rake gem
merge master into develop
update twitter gem, refactor implementation due to gem updates