diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..176a458f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/INSTRUCTIONS b/INSTRUCTIONS
index 29905883e..156cd7195 100644
--- a/INSTRUCTIONS
+++ b/INSTRUCTIONS
@@ -1,15 +1,15 @@
-Follow the next steps to run the sample on Tomcat 7.0
-- Download and install a JDK 
-- Download and upzip Eclipse
-- Download and unzip Tomcat 7
-- Run Eclipse
-- In eclipse, go to Help/Eclipse Marketplace
-- Install m2e plugin (maven)
-- Install m2e-wtp plugin (maven for wtp)
-- Unzip mybatis-jpetstore-6.0.x-sources.zip
-- In eclipse, select File/Import/Maven/Existing Maven Projects
-- Select the folder where you unzipped mybatis-jpetstore-6.0.x-sources.zip
-- A new project named "jpetstore" will be shown
-- Right click on jpetstore project and select "run on server"
-- Select Tomcat 7 Server and set your installation directory
+Follow the next steps to run the sample on Tomcat 7.0
+- Download and install a JDK 
+- Download and upzip Eclipse
+- Download and unzip Tomcat 7
+- Run Eclipse
+- In eclipse, go to Help/Eclipse Marketplace
+- Install m2e plugin (maven)
+- Install m2e-wtp plugin (maven for wtp)
+- Unzip mybatis-jpetstore-6.0.x-sources.zip
+- In eclipse, select File/Import/Maven/Existing Maven Projects
+- Select the folder where you unzipped mybatis-jpetstore-6.0.x-sources.zip
+- A new project named "jpetstore" will be shown
+- Right click on jpetstore project and select "run on server"
+- Select Tomcat 7 Server and set your installation directory
 - JPetStore home page should be shown
\ No newline at end of file
diff --git a/src/main/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02e..59499bce4 100644
--- a/src/main/webapp/META-INF/MANIFEST.MF
+++ b/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,2 +1,2 @@
-Manifest-Version: 1.0
-
+Manifest-Version: 1.0
+
diff --git a/src/main/webapp/css/jpetstore.css b/src/main/webapp/css/jpetstore.css
index 4c9ef8242..214a490a7 100644
--- a/src/main/webapp/css/jpetstore.css
+++ b/src/main/webapp/css/jpetstore.css
@@ -1,323 +1,323 @@
-body {
-  margin: 0ex 10ex 0ex 10ex;
-  padding: 0ex;
-  font-family: helvetica, tahoma, arial, verdana, sans-serif;
-  font-size: 2ex;
-  color: #333;
-  background-color: #444;
-}
-
-pre {
-  font-family: "Courier New", Courier, mono;
-
-  font-style: normal;
-  background-color: #FFFFFF;
-  white-space: pre
-}
-
-h1 {
-  margin: 1ex 0ex 1ex 0ex;
-  padding: 0ex;
-
-  line-height: 3ex;
-  font-weight: 900;
-  color: #666;
-}
-
-h2 {
-  margin: 2ex 0ex 1ex 0ex;
-  padding: 0ex;
-
-  line-height: 2ex;
-  font-weight: 700;
-  color: #444;
-}
-
-h3 {
-  margin: 1ex 0ex 1ex 0ex;
-  padding: 0ex;
-
-  line-height: 1.6ex;
-  font-weight: 700;
-  color: #222;
-}
-
-p {
-  font-family: helvetica, tahoma, arial, verdana, sans-serif;
-
-  margin: 0ex 0ex 0ex 0ex;
-  padding: 2ex;
-}
-
-img {
-  border: 0;
-}
-
-li {
-  font-family: helvetica, tahoma, arial, verdana, sans-serif;
-
-  margin: 0ex 0ex 0ex 0ex;
-  padding: 0ex;
-}
-
-table {
-  border-width: 0;
-  empty-cells: show;
-}
-
-td, th {
-  empty-cells: show;
-  padding: .3ex .3ex;
-  vertical-align: top;
-  text-align: left;
-  border-width: 0;
-  border-spacing: 0;
-  background-color: #ececec
-}
-
-th {
-  font-weight: bold;
-  background-color: #e2e2e2;
-}
-
-a, a:visited, a:link {
-  color: #039;
-
-  text-decoration: none;
-  font-family: helvetica, tahoma, arial, verdana, sans-serif;
-}
-
-a:hover {
-  color: #69f;
-}
-
-a.Button, a.Button:link, a.Button:visited {
-  padding: .3ex;
-  color: #fff;
-  background-color: #005e21;
-  text-decoration: none;
-  font-family: helvetica, tahoma, arial, verdana, sans-serif;
-  font-size: 1.5ex;
-}
-
-a.Button:hover {
-  color: #000;
-  background-color: #54c07a;
-}
-
-#Logo {
-  width: 33%;
-  height: 9ex;
-  margin: 0ex 0ex 0ex 0ex;
-  padding: 0ex 0ex 0ex 0ex;
-  border-width: 0ex 0ex .3ex 0px;
-  border-style: solid;
-  border-color: #ccc;
-  float: left;
-  background-color: #000;
-  color: #fff;
-  line-height: 9ex;
-  voice-family: "\"}\"";
-  voice-family: inherit;
-  height: 9ex;
-}
-
-body>#Logo {
-  height: 9ex;
-}
-
-#Menu {
-  width: 33%;
-  height: 9ex;
-  margin: 0ex 0ex 0ex 0ex;
-  padding: 0ex 0ex 0ex 0ex;
-  border-width: 0ex 0ex .3ex 0px;
-  border-style: solid;
-  border-color: #ccc;
-  float: left;
-  background-color: #000;
-  color: #eaac00;
-  text-decoration: none;
-  font-family: helvetica, tahoma, arial, verdana, sans-serif;
-  text-align: center;
-  line-height: 9ex;
-  voice-family: "\"}\"";
-  voice-family: inherit;
-  height: 9ex;
-}
-
-#Menu, #Menu a, #Menu a:link, #Menu a:visited, #Menu a:hover {
-  color: #eaac00;
-  text-decoration: none;
-  font-family: helvetica, tahoma, arial, verdana, sans-serif;
-}
-
-body>#Menu {
-  height: 9ex;
-}
-
- {
-}
-
-#Search {
-  width: 33%;
-  height: 9ex;
-  margin: 0ex 0ex 0ex 0ex;
-  padding: 0ex 0ex 0ex 0ex;
-  border-width: 0ex 0ex .3ex 0px;
-  border-style: solid;
-  border-color: #ccc;
-  float: left;
-  text-align: center;
-  background-color: #000;
-  color: #eaac00;
-  line-height: 9ex;
-  voice-family: "\"}\"";
-  voice-family: inherit;
-  height: 9ex;
-}
-
-body>#Search {
-  height: 9ex;
-}
-
-#Search input {
-  border-width: .1ex .1ex .1ex .1ex;
-  border-style: solid;
-  border-color: #aaa;
-  background-color: #666;
-  color: #eaac00;
-}
-
-#QuickLinks {
-  text-align: center;
-  background-color: #FFF;
-  width: 99%;
-}
-
-#PoweredBy {
-  width: 30%;
-  height: 9ex;
-  margin: 0ex 0ex 0ex 0ex;
-  padding: 0ex 0ex 0ex 0ex;
-  border-width: .3ex 0ex .3ex 0px;
-  border-style: solid;
-  border-color: #ccc;
-  float: left;
-  background-color: #000;
-  color: #fff;
-  line-height: 9ex;
-  voice-family: "\"}\"";
-  voice-family: inherit;
-  height: 9ex;
-}
-
-body>#PoweredBy {
-  height: 9ex;
-}
-
-#Banner {
-  width: 69%;
-  height: 9ex;
-  margin: 0ex 0ex 0ex 0ex;
-  padding: 0ex 0ex 0ex 0ex;
-  border-width: .3ex 0ex .3ex 0px;
-  border-style: solid;
-  border-color: #ccc;
-  float: left;
-  background-color: #000;
-  color: #fff;
-  line-height: 9ex;
-  voice-family: "\"}\"";
-  voice-family: inherit;
-  height: 9ex;
-}
-
-body>#Banner {
-  height: 9ex;
-}
-
-#Content {
-  margin: 0;
-  padding: 0ex 0ex 0ex 0ex;
-  width: 99%;
-  color: #333;
-  background-color: #FFF;
-  border-width: 0;
-}
-
-#Separator {
-  clear:both;
-  margin: 0;
-  height:0;
-}
-
-#Main {
-  margin: 0;
-  padding: 1ex;
-  color: #333;
-  background-color: #FFF;
-  border-width: 1ex 0ex 2ex 0px;
-  border-style: solid;
-  border-color: #fff;
-}
-
-#Sidebar {
-  float: left;
-  background:inherit;
-  width: 30%;
-}
-
-#MainImage {
-  float: left;
-  background:inherit;
-  text-align:center;
-  width: 50%;
-}
-
-#Catalog {
-  padding: 1ex;
-  background:inherit;
-  text-align:center;
-}
-
-#Catalog input[type="submit"]{
-  padding: .3ex;
-  color: #fff;
-  background-color: #005e21;
-  text-decoration: none;
-  font-family: helvetica, tahoma, arial, verdana, sans-serif;
-  font-size: 1.5ex;
-  border-width:0;
-}
-#Catalog input[type="submit"]:hover {
-  color: #000;
-  background-color: #54c07a;
-  cursor:pointer;
-}
-
-#Catalog table{
-  margin-left:auto;
-  margin-right:auto;
-}
-
-#BackLink{
-  padding: 1ex;
-  float: right;
-  border-width: .1ex 0ex .1ex 0px;
-  border-style: solid;
-  border-color: #000;
-}
-
-#Cart{
-  width: 69.99%;
-  float: left;
-  background-color:#fff;
-}
-
-#MyList{
-  width: 30%;
-  float: left;
-  background-color:#ccc;
-  text-align:left;
-}
+body {
+  margin: 0ex 10ex 0ex 10ex;
+  padding: 0ex;
+  font-family: helvetica, tahoma, arial, verdana, sans-serif;
+  font-size: 2ex;
+  color: #333;
+  background-color: #444;
+}
+
+pre {
+  font-family: "Courier New", Courier, mono;
+
+  font-style: normal;
+  background-color: #FFFFFF;
+  white-space: pre
+}
+
+h1 {
+  margin: 1ex 0ex 1ex 0ex;
+  padding: 0ex;
+
+  line-height: 3ex;
+  font-weight: 900;
+  color: #666;
+}
+
+h2 {
+  margin: 2ex 0ex 1ex 0ex;
+  padding: 0ex;
+
+  line-height: 2ex;
+  font-weight: 700;
+  color: #444;
+}
+
+h3 {
+  margin: 1ex 0ex 1ex 0ex;
+  padding: 0ex;
+
+  line-height: 1.6ex;
+  font-weight: 700;
+  color: #222;
+}
+
+p {
+  font-family: helvetica, tahoma, arial, verdana, sans-serif;
+
+  margin: 0ex 0ex 0ex 0ex;
+  padding: 2ex;
+}
+
+img {
+  border: 0;
+}
+
+li {
+  font-family: helvetica, tahoma, arial, verdana, sans-serif;
+
+  margin: 0ex 0ex 0ex 0ex;
+  padding: 0ex;
+}
+
+table {
+  border-width: 0;
+  empty-cells: show;
+}
+
+td, th {
+  empty-cells: show;
+  padding: .3ex .3ex;
+  vertical-align: top;
+  text-align: left;
+  border-width: 0;
+  border-spacing: 0;
+  background-color: #ececec
+}
+
+th {
+  font-weight: bold;
+  background-color: #e2e2e2;
+}
+
+a, a:visited, a:link {
+  color: #039;
+
+  text-decoration: none;
+  font-family: helvetica, tahoma, arial, verdana, sans-serif;
+}
+
+a:hover {
+  color: #69f;
+}
+
+a.Button, a.Button:link, a.Button:visited {
+  padding: .3ex;
+  color: #fff;
+  background-color: #005e21;
+  text-decoration: none;
+  font-family: helvetica, tahoma, arial, verdana, sans-serif;
+  font-size: 1.5ex;
+}
+
+a.Button:hover {
+  color: #000;
+  background-color: #54c07a;
+}
+
+#Logo {
+  width: 33%;
+  height: 9ex;
+  margin: 0ex 0ex 0ex 0ex;
+  padding: 0ex 0ex 0ex 0ex;
+  border-width: 0ex 0ex .3ex 0px;
+  border-style: solid;
+  border-color: #ccc;
+  float: left;
+  background-color: #000;
+  color: #fff;
+  line-height: 9ex;
+  voice-family: "\"}\"";
+  voice-family: inherit;
+  height: 9ex;
+}
+
+body>#Logo {
+  height: 9ex;
+}
+
+#Menu {
+  width: 33%;
+  height: 9ex;
+  margin: 0ex 0ex 0ex 0ex;
+  padding: 0ex 0ex 0ex 0ex;
+  border-width: 0ex 0ex .3ex 0px;
+  border-style: solid;
+  border-color: #ccc;
+  float: left;
+  background-color: #000;
+  color: #eaac00;
+  text-decoration: none;
+  font-family: helvetica, tahoma, arial, verdana, sans-serif;
+  text-align: center;
+  line-height: 9ex;
+  voice-family: "\"}\"";
+  voice-family: inherit;
+  height: 9ex;
+}
+
+#Menu, #Menu a, #Menu a:link, #Menu a:visited, #Menu a:hover {
+  color: #eaac00;
+  text-decoration: none;
+  font-family: helvetica, tahoma, arial, verdana, sans-serif;
+}
+
+body>#Menu {
+  height: 9ex;
+}
+
+ {
+}
+
+#Search {
+  width: 33%;
+  height: 9ex;
+  margin: 0ex 0ex 0ex 0ex;
+  padding: 0ex 0ex 0ex 0ex;
+  border-width: 0ex 0ex .3ex 0px;
+  border-style: solid;
+  border-color: #ccc;
+  float: left;
+  text-align: center;
+  background-color: #000;
+  color: #eaac00;
+  line-height: 9ex;
+  voice-family: "\"}\"";
+  voice-family: inherit;
+  height: 9ex;
+}
+
+body>#Search {
+  height: 9ex;
+}
+
+#Search input {
+  border-width: .1ex .1ex .1ex .1ex;
+  border-style: solid;
+  border-color: #aaa;
+  background-color: #666;
+  color: #eaac00;
+}
+
+#QuickLinks {
+  text-align: center;
+  background-color: #FFF;
+  width: 99%;
+}
+
+#PoweredBy {
+  width: 30%;
+  height: 9ex;
+  margin: 0ex 0ex 0ex 0ex;
+  padding: 0ex 0ex 0ex 0ex;
+  border-width: .3ex 0ex .3ex 0px;
+  border-style: solid;
+  border-color: #ccc;
+  float: left;
+  background-color: #000;
+  color: #fff;
+  line-height: 9ex;
+  voice-family: "\"}\"";
+  voice-family: inherit;
+  height: 9ex;
+}
+
+body>#PoweredBy {
+  height: 9ex;
+}
+
+#Banner {
+  width: 69%;
+  height: 9ex;
+  margin: 0ex 0ex 0ex 0ex;
+  padding: 0ex 0ex 0ex 0ex;
+  border-width: .3ex 0ex .3ex 0px;
+  border-style: solid;
+  border-color: #ccc;
+  float: left;
+  background-color: #000;
+  color: #fff;
+  line-height: 9ex;
+  voice-family: "\"}\"";
+  voice-family: inherit;
+  height: 9ex;
+}
+
+body>#Banner {
+  height: 9ex;
+}
+
+#Content {
+  margin: 0;
+  padding: 0ex 0ex 0ex 0ex;
+  width: 99%;
+  color: #333;
+  background-color: #FFF;
+  border-width: 0;
+}
+
+#Separator {
+  clear:both;
+  margin: 0;
+  height:0;
+}
+
+#Main {
+  margin: 0;
+  padding: 1ex;
+  color: #333;
+  background-color: #FFF;
+  border-width: 1ex 0ex 2ex 0px;
+  border-style: solid;
+  border-color: #fff;
+}
+
+#Sidebar {
+  float: left;
+  background:inherit;
+  width: 30%;
+}
+
+#MainImage {
+  float: left;
+  background:inherit;
+  text-align:center;
+  width: 50%;
+}
+
+#Catalog {
+  padding: 1ex;
+  background:inherit;
+  text-align:center;
+}
+
+#Catalog input[type="submit"]{
+  padding: .3ex;
+  color: #fff;
+  background-color: #005e21;
+  text-decoration: none;
+  font-family: helvetica, tahoma, arial, verdana, sans-serif;
+  font-size: 1.5ex;
+  border-width:0;
+}
+#Catalog input[type="submit"]:hover {
+  color: #000;
+  background-color: #54c07a;
+  cursor:pointer;
+}
+
+#Catalog table{
+  margin-left:auto;
+  margin-right:auto;
+}
+
+#BackLink{
+  padding: 1ex;
+  float: right;
+  border-width: .1ex 0ex .1ex 0px;
+  border-style: solid;
+  border-color: #000;
+}
+
+#Cart{
+  width: 69.99%;
+  float: left;
+  background-color:#fff;
+}
+
+#MyList{
+  width: 30%;
+  float: left;
+  background-color:#ccc;
+  text-align:left;
+}