Fix username from the test merge
Removed ~ files
Updating master from dev