added loading view
added loading spinner
merge conflicts
merge