Work on #247
Work on #247

A little further on the merge import testing...

adapt-it/adapt-it-mobile,eb1/adapt-it-mobile,adapt-it/adapt-it-mobile,adapt-it/adapt-it-mobile,eb1/adapt-it-mobile,eb1/adapt-it-mobile