Added html for friens template. Added build directory to gitignore
Resolved conflicts with 'friends_section' and 'master branches
Added missed files for configurations grunt improvements