Merge branch 'admin' of https://github.com/jaav/r2s
First Day with Play 2.1
Two new partials added. was looking into the Forms and partial.
+ app\views\_defaultAdminPartial.scala.html :  new default page partials
+ app\views\_enterprisesPartial.scala.html : New enterprise partial
~ app\controllers\Admin.java : New form creation an attempt
~ app\views\admin.scala.html : Layout change
~ public\javascripts\r2s_admin.js : Script check
~ public\stylesheets\r2s_admin.css : CSS class added
Merge branch 'admin' of https://github.com/jaav/r2s
New partials added for each sections.
Start with design.
+ app\views\_buildingPartial.scala.html : New partial added
+ app\views\_countryPartial.scala.html : New partial added
+ app\views\_documentPartial.scala.html : New partial added
+ app\views\_employeePartial.scala.html : New partial added
+ app\views\_generalPartial.scala.html : New partial added
+ app\views\_operationPartial.scala.html : New partial added
+ app\views\_toolPartial.scala.html : New partial added
+ app\views\_workunitPartial.scala.html : New partial added
~ app\controllers\Admin.java : new methods added
~ app\views\_defaultAdminPartial.scala.html : template updated
~ app\views\_enterprisesPartial.scala.html : Template updated
~ app\views\admin.scala.html : Template updated
~ conf\routes : Route file updated
~ public\javascripts\r2s_admin.js : script added
~ public\stylesheets\r2s_admin.css : css change
Save Enterprise information...
With JQUERY manage with partial

~ app\controllers\Admin.java : Method added to save information
~ app\dao\AbstractDao.java : Method added
~ app\model\Enterprise.java : Method updated
~ app\utils\Util.java : UTIL changed
~ app\views\_enterprisesPartial.scala.html : template update
~ public\javascripts\r2s_admin.js : script changed
Code updated (Comments added)
~ app\controllers\Admin.java : New list of enterprise without any condition (without any Identifier)
~ app\dao\AbstractDao.java : Code comments
~ app\utils\Util.java : code comments
~ app\views\admin.scala.html : template updated
Merge branch 'admin'

* admin:
  Code updated (Comments added) ~ app\controllers\Admin.java : New list of enterprise without any condition (without any Identifier) ~ app\dao\AbstractDao.java : Code comments ~ app\utils\Util.java : code comments ~ app\views\admin.scala.html : template updated
  Save Enterprise information... With JQUERY manage with partial
  New partials added for each sections. Start with design. + app\views\_buildingPartial.scala.html : New partial added + app\views\_countryPartial.scala.html : New partial added + app\views\_documentPartial.scala.html : New partial added + app\views\_employeePartial.scala.html : New partial added + app\views\_generalPartial.scala.html : New partial added + app\views\_operationPartial.scala.html : New partial added + app\views\_toolPartial.scala.html : New partial added + app\views\_workunitPartial.scala.html : New partial added ~ app\controllers\Admin.java : new methods added ~ app\views\_defaultAdminPartial.scala.html : template updated ~ app\views\_enterprisesPartial.scala.html : Template updated ~ app\views\admin.scala.html : Template updated ~ conf\routes : Route file updated ~ public\javascripts\r2s_admin.js : script added ~ public\stylesheets\r2s_admin.css : css change
  First Day with Play 2.1 Two new partials added. was looking into the Forms and partial. + app\views\_defaultAdminPartial.scala.html :  new default page partials + app\views\_enterprisesPartial.scala.html : New enterprise partial ~ app\controllers\Admin.java : New form creation an attempt ~ app\views\admin.scala.html : Layout change ~ public\javascripts\r2s_admin.js : Script check ~ public\stylesheets\r2s_admin.css : CSS class added

Conflicts:
	conf/routes