Added timer code.
Added angular-timer.
Added some settings.
Merged cao
fixed item generation bugs