Initial commit
Merge origin/master
Merge commit '5e9e36daad6a953f0d978f88e434690e6fe997d6'
develop dic -12 tests
develop dic -12 tests
develop dic -14 tests
develop dic -14 tests
develop dic -14 tests
Merge commit 'c1771d3e2ed08bd1f0727f7d5021a30650dfef71' into develop

Conflicts:
	tests/library/Zaboy/applicationTest.ini
Merge commit 'c1771d3e2ed08bd1f0727f7d5021a30650dfef71' into develop

Conflicts:
	tests/library/Zaboy/applicationTest.ini