Merge remote-tracking branch 'origin/development'

Conflicts:
	.gitignore
	pom.xml
	src/site/apt/sprint_backlog.apt

diff --cc .settings/org.eclipse.core.resources.prefs
index 0000000,0000000..4c28b1a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@@ -1,0 -1,0 +1,4 @@@
++eclipse.preferences.version=1\r
++encoding//src/main/java=UTF-8\r
++encoding//src/test/java=UTF-8\r
++encoding/<project>=UTF-8\r

diff --cc .settings/org.eclipse.jdt.core.prefs
index 0000000,0000000..d59e09c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@@ -1,0 -1,0 +1,5 @@@
++eclipse.preferences.version=1\r
++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
++org.eclipse.jdt.core.compiler.compliance=1.8\r
++org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning\r
++org.eclipse.jdt.core.compiler.source=1.8\r

diff --cc pom.xml
index 5c091ef,c12c478..d07cddd
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>\r
        <groupId>srs-purple</groupId>\r
        <artifactId>srs-purple-main</artifactId>\r
-       <version>1.1</version>\r
 -      <version>1.3-SNAPSHOT</version>\r
++      <version>1.4</version>\r
        <name>Smart Reservation System</name>\r
        <description>Some description ...</description>\r
        <organization>\r

diff --cc src/site/apt/sprint_backlog.apt
index 6bfbfdc,57814b8..064a700
--- 1/src/site/apt/sprint_backlog.apt
--- 2/src/site/apt/sprint_backlog.apt
+++ b/src/site/apt/sprint_backlog.apt
@@@ -68,6 -68,10 +68,8 @@@ Sprint Backlo
  |                     |                                                       |                                                       |                               |[h]    |[h]    |[h]    |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
  
 -
 -
+ 
+ 
  * 3. finished tasks
  
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+