Merge branch 'admin'

* admin:
  Rebuilding git repo
  Rebuilding git repo
  no message
  no message
Some styling changes and started with button view
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
Adding background image to canvas
Version deployed for first demo
Version deployed for first demo
Merge remote-tracking branch 'remotes/origin/admin'

* remotes/origin/admin:
  Updated cod for the employee added. New change in function for enterprise and country. ~ app\controllers\Admin.java : New function added and update with previous ~ app\dao\AbstractDao.java : new function added ~ app\model\Country.java : function updated ~ app\model\Employee.java : Function updated ~ app\utils\Util.java : new function added ~ app\views\_countryPartial.scala.html : template updated ~ app\views\_employeePartial.scala.html : template updated ~ app\views\_operationPartial.scala.html : template updated ~ app\views\admin.scala.html : template updated ~ conf\routes : route change ~ public\javascripts\r2s_admin.js : script change ~ public\stylesheets\r2s_admin.css : css updated
  Unwanted code removed.. ~ Admin.java : code removed/updated.
  Code updated for parent details..
  Country Add information...

Conflicts:
	app/controllers/Admin.java
	app/model/Country.java
	app/utils/Util.java
Operation Block code update.
~ app\controllers\Admin.java : - new function to save operation details
~ app\model\Operation.java : new function added
~ app\utils\Util.java : comment made to few function. Function removed
~ app\views\_operationPartial.scala.html : template updated
~ conf\routes : file updated
~ public\javascripts\r2s_admin.js : script updated