change width to 80% for input field name is username, to resolve problem that characters are show in new line
add internationaliztion for chinese
Improved Chinese internationalization
Improved Chinese internationalization for explorer
Merge branch 'master' of github.com:henryyan/Activiti

* 'master' of github.com:henryyan/Activiti:
  Improved Chinese internationalization
add .DS_Store to .gitignore
Merge remote-tracking branch 'upstream/master'

* upstream/master: (21 commits)
  Fix explorer url (see http://forums.activiti.org/en/viewtopic.php?f=6&t=4688)
  Fix for ACT-1290: TaskService.saveTask(Task) does not enforce optimistic locking
  Deprecated account-related operations
  Fix for ACT-1390: Activiti incorrectly logs SEVERE level messages for expected lock collisions
  Adding extra destroy to PluggableActivitiTestCase, just to be sure
  Added activiti config for spring and jta tests
  Re-introducing caching now we found the culprit (overzealous caching in the ResourceActivitiTestCase, where it would add an in-memory H2 driven process engine, which would then be picked up by the PluggableActivitiTestCase). This makes running the tests again faster.
  Trying to fix strange cache issue on QA
  Removed unused constant
  Diagram-generator now using gradients for task-box + removed unneeded commented out lines
  Fixing ProcessDiagramRetrievalTest on JDK 7
  Disabled ProcessDiagramRetrievalTest, as it fails on JDK 7. Enabled tests which were excluded and whose jira issue was resolved.
  temporary hack to test qa
  Also pointing to non in-mem db for qa
  ACT-1392: Task-names now able to span multiple lines
  Adding logging to process engine initialization to find strange errors on Jenkins
  Changed to normal config to prevent default in-mem behavior
  (possible) fix for failing email tests
  ACT-1334: standalone task has two owners (Explorer)
  ACT-1318: added test case for bug report. Can't reproduce the bug from the issue, but still committing the tests nonetheless as they are useful
  ...
ACT-1415: Timer declarations on start-events can now contain expressions
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  ACT-1415: Timer declarations on start-events can now contain expressions
Inital fix for ACT_1387
QA Fix: running jta job on postgres instead of h2
QA Fix: running jta job on postgres instead of h2 (2nd try)
QA Fix: running jta job on postgres instead of h2 (3th try)
Additional index on PROC_INST_ID_ and ACT_ID_ for historic activity
Added upgrade-statements for new index in 5.11
Merge pull request #1 from henryyan/master

Added Chinese internationalization
- Revised development script for explorer: added 'development' spring profile. Adapted start-server.sh.
- Added rounded borders to login form on firefox
Created BPMN XML converter project and changes to modeler component
Merge branch 'master' of https://github.com/Activiti/Activiti
Deployment and ProcDefs now have spring-configurable query-filter +
Callactivity calledProcess mutable after parsing
Conflicts:

	modules/activiti-webapp-explorer2/.classpath
	modules/activiti-webapp-explorer2/.project
	modules/activiti-webapp-explorer2/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionListQuery.java