Merge pull request #10 from rorlab/master

거래 업로드된 사진 삭제하기 (upstream 머지후 풀퀘함)
first commit in items
fix karma.conf.js js dependency
fix loading
co
refactoring avatarUpload directive
Merge remote-tracking branch 'origin/pr/11'
remove unnecessary ng-show
fix blink group info
add toastr
add toastr
add toastr to karma
use account_group
timeline.js 충돌해결함.

Merge commit '0ff9bcb550d48ec7f83c363d50362e4e6e5aaf78'

# By subicura (10) and spearsky (1)
# Via subicura (2) and Chungsub Kim (1)
* commit '0ff9bcb550d48ec7f83c363d50362e4e6e5aaf78':
  use account_group
  add toastr to karma
  add toastr
  add toastr
  fix blink group info
  remove unnecessary ng-show
  refactoring avatarUpload directive
  co
  fix loading
  fix karma.conf.js js dependency
  first commit in items

Conflicts:
	app/scripts/controllers/app/group/timeline.js