Merge pull request #742 from mposolda/master

Simplify method signature in JsonSerialization
Added always-refresh-token option to adapters