Populating structure in place
Populating coming along
Merge branch 'master' into mergepopulate

Conflicts:
	group1-sprint2/src/main/java/com/ericsson/project/importing/ImportData.java
	group1-sprint2/src/main/webapp/index.html
Populate basic code IN
Population works (with minor database changes)