Jeszcze raz zmiany
I znowu zmiany
Merge branch 'master' of https://github.com/guras/Akuku

Conflicts:
	I1/src/main/java/pl/guras/i1/dao/PersonDaoImpl.java
	I1/src/main/java/pl/guras/i1/dao/ProjectDao.java
	I1/src/main/java/pl/guras/i1/dao/ReportDao.java
	I1/src/main/java/pl/guras/i1/entity/Color.java
	I1/src/main/java/pl/guras/i1/entity/Project.java
	I1/src/main/java/pl/guras/i1/entity/WeeklyReport.java
	I1/src/main/java/pl/guras/i1/report/generator/ReportGenerator.java
Rzeba przy generowaniu raportu do doca
Dodano report downloadera
Merge branch 'master' of https://github.com/guras/Akuku.git

Conflicts:
	I1/src/main/java/pl/guras/i1/controllers/ReportController.java
	I1/src/main/java/pl/guras/i1/controllers/UserReportManageController.java
	I1/src/main/java/pl/guras/i1/dao/ReportDao.java
	I1/src/main/java/pl/guras/i1/entity/WeeklyReport.java
	I1/src/main/resources/META-INF/persistence.xml
	I1/src/main/webapp/WEB-INF/datasource.xml
	I1/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	I1/src/main/webapp/WEB-INF/pages/hello.jsp
	I1/src/main/webapp/WEB-INF/web.xml