fixat en del.
Merge branch 'master' of https://github.com/rodde177/jensen_admin