code updated for view partials..
~ app\controllers\Admin.java
~ app\dao\AbstractDao.java
~ app\views\_buildingPartial.scala.html
~ app\views\_countryPartial.scala.html
~ app\views\_documentPartial.scala.html
~ app\views\_employeePartial.scala.html
~ app\views\_enterprisesPartial.scala.html
~ app\views\_operationPartial.scala.html
~ app\views\_toolPartial.scala.html
~ app\views\_viewCountry.scala.html
~ app\views\_viewEmployee.scala.html
~ app\views\_viewOperation.scala.html
~ app\views\_workunitPartial.scala.html
~ conf\routes
~ public\javascripts\jquery.form.js
~ public\javascripts\r2s_admin.js
Merge branch 'admin'

# By Balkrishna
# Via Balkrishna
* admin:
  code updated for view partials.. ~ app\controllers\Admin.java ~ app\dao\AbstractDao.java ~ app\views\_buildingPartial.scala.html ~ app\views\_countryPartial.scala.html ~ app\views\_documentPartial.scala.html ~ app\views\_employeePartial.scala.html ~ app\views\_enterprisesPartial.scala.html ~ app\views\_operationPartial.scala.html ~ app\views\_toolPartial.scala.html ~ app\views\_viewCountry.scala.html ~ app\views\_viewEmployee.scala.html ~ app\views\_viewOperation.scala.html ~ app\views\_workunitPartial.scala.html ~ conf\routes ~ public\javascripts\jquery.form.js ~ public\javascripts\r2s_admin.js

Conflicts:
	public/javascripts/r2s_admin.js