Resolving conflict before merging Refactoring with origin/Refactoring
Resolving conflict before merging Refactoring with origin/Refactoring
Resolving conflict before merging Refactoring with origin/Refactoring
Merge remote-tracking branch 'origin/Refactoring' into Refactoring
adding earth module with nation application submission functionality
removing some unnecessary files
committing resolved conflicts for merging Refactoring and origin/Refactoring