renamed
add first test
Merged 'dev'.
Finish modal-spinner