removing google analytics code from dev..
fixed some bugs..
merged dev