Merged @nhaarman naming convention fixes, Dutch translation + some methods position in class