updated to allow cookie permanent store
Merge branch 'development' update cookies to store user permanently