Initial import from http://svn.wikidpad2.webfactional.com/branches/mbutscher/work/ revision 395.
Merge branch 'master' of https://github.com/weijia/wikidpad

Conflicts:
	.gitignore