add aptana project and redirect file
Merge remote-tracking branch 'origin/master'
update main page