Added ER diagram interface.
Merge origin/master