* Updated to ignore local uImages and logs folder
Merge branch 'development' into feature-rememberme
* If user has remember-me cookie, don't timeout