add alias restomcat
add alias rebuild
add mysqlrc
merge from master