Country Add information...

~ app\controllers\Admin.java : New functions added
~ app\model\Country.java : New functions added
~ app\views\_countryPartial.scala.html : template updated
~ app\views\_generalPartial.scala.html : template updated
~ app\views\admin.scala.html : template updated
~ conf\routes : control path updated
~ public\javascripts\r2s_admin.js : script added
Code updated for parent details..

~ app\controllers\Admin.java : Admin function and saveCountry updated
~ app\dao\AbstractDao.java : new function added
~ app\views\_employeePartial.scala.html : Template update
~ app\views\admin.scala.html : template updated
Unwanted code removed..
~ Admin.java : code removed/updated.
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
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