checkstyleの修正結果をマージ
checkstyleの修正結果をマージ
Merge branch 'master' of https://github.com/endosnipe/ENdoSnipe

Conflicts:
	Dashboard/src/main/java/jp/co/acroquest/endosnipe/web/dashboard/config/ConfigurationReader.java

コンフリクトを修正してマージ
Merge branch 'master' of https://github.com/tmnroooi/ENdoSnipe

Conflicts:
	Dashboard/src/main/java/jp/co/acroquest/endosnipe/web/dashboard/config/ConfigurationReader.java
Merge branch 'master' of https://github.com/endosnipe/ENdoSnipe

Conflicts:
	Dashboard/LICENSE.txt
	Dashboard/WebContent/WEB-INF/include/DashboardInclude.jsp
	Dashboard/WebContent/WEB-INF/views/Dashboard.jsp
	Dashboard/WebContent/resources/js/common/constants.js
	Dashboard/src/main/java/jp/co/acroquest/endosnipe/web/dashboard/controller/ReportController.java
	ENdoSnipeCommon/META-INF/MANIFEST.MF
	ENdoSnipeCommunicator/META-INF/MANIFEST.MF
	ENdoSnipeDataAccessor/META-INF/MANIFEST.MF
	ENdoSnipeDataAccessor/pom.xml
	ENdoSnipeDataCollector/META-INF/MANIFEST.MF
nullチェックを追加。
nullチェックを追加。
chechstyle対応の作業内容をマージ
Merge branch 'master' of https://github.com/endosnipe/ENdoSnipe

Conflicts:
	Dashboard/pom.xml
	ENdoSnipeDataAccessor/pom.xml
checkStyle対応をマージした。