Resolving merge conflicts.
Resolving merge conflicts.

travisp/ABingo,wavii/abingo,gyulalaszlo/abingo_mongoid,swalberg/abingo,glenngillen/bananasplit,efficiency20/abingo,openSUSE/abingo,lawrence-forooghian/abingo