Added DicNix/res from TestBranch
Update of res/values
Added new activities from TestBranch2
Android manifest from TestBranch2
Merge branch 'code' into retrive
Created javadoc and changed source file encoding to UTF-8