~ app\controllers\Admin.java
~ app\dao\AbstractDao.java
~ app\dao\WorkUnitEmployeeMapDao.java
~ app\model\Building.java
~ app\model\Tool.java
~ app\model\WorkUnit.java
~ app\views\_documentPartial.scala.html
~ app\views\_editBuilding.scala.html
~ app\views\_editCountry.scala.html
~ app\views\_editDocument.scala.html
~ app\views\_editEmployee.scala.html
~ app\views\_editEnterprises.scala.html
~ app\views\_editOperation.scala.html
~ app\views\_editTool.scala.html
~ app\views\_editWorkUnit.scala.html
~ app\views\_employeePartial.scala.html
~ app\views\_viewEmployee.scala.html
~ conf\routes
~ public\javascripts\jquery.form.js
Merge branch 'admin2' of https://github.com/jaav/r2s

Conflicts:
	app/controllers/Admin.java
	app/dao/AbstractDao.java
	app/dao/WorkUnitEmployeeMapDao.java
	app/views/_editBuilding.scala.html
	app/views/_editCountry.scala.html
	app/views/_editTool.scala.html
	app/views/_editWorkUnit.scala.html
	app/views/_employeePartial.scala.html
	public/javascripts/jquery.form.js