Ignore the .iml file in the root
Whitespace formatting
Removal of svn files
Removal of svn files
Removed idea iml file
Merge remote-tracking branch 'origin/master'

Conflicts:
	brightcove-assembly/pom.xml
	brightcove-wrapper/brightcove-wrapper.iml
Merge remote-tracking branch 'origin/master'
Changed the componentGroup to "Page Components"