editing aws default url
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
edit for conflict
editing users show for conflict
minor changes is app html
css fix for user profile default photo problem
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development