removed ftp-settings
added view, scribble, profile, wall and gallery pages
fix in login.php
merge