Stub for the Salary table, fixed Salary table name
Stub for the Salary table, fixed Salary table name
gitignore fix
gitignore fix
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-model/src/main/java/school/model/Salary.java
	school-web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	school-web/target/m2e-wtp/web-resources/META-INF/maven/lv128/school-web/pom.properties