Changes order of html5-normalize import.
Layout fixes. Fix user mgmgnt code to comply with new Rails API
Fix api param for user access_token
Merge conflict