merging
Merge branch 'devbli' into dev
db
passing to betts
Updating valid_query helper method for tests
pages and stuff to query
Merging conflicts revision