Get Source Code To My Branch

Merge the newest source code to my local code and them i will push my I18N solution later.