added idea files and update bower and grunt
resolved merge conflicts
updated project files