Fix our web directory problem

We will now open the right web directory. Also make sure to check out the
README.md for how to set things up in IntelliJ so debug will work
correctly.
Merge pull request #8 from yaronyg/master

Fix our web directory problem
Addressbook
Merge branch 'umaster'

Conflicts:
	Java/src/main/java/com/msopentech/ThaliClient/ProxyDesktop.java
Working addressbook
Working addressbook