firefox demo fixes
added bower instructions
fixed conflicts