still fixing . ver2 (Photos and Comments)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/typical_if/android/fragment/FragmentPhotoCommentAndInfo.java
still fixing . ver2 (Photos and Comments)
The fixing has already done ! I've finished over "likes" and "comments" for photos, started work on likes and reposts for wall posts. For now remain a little bit for done with it.
The fixing has already done ! I've finished over "likes" and "comments" for photos, started work on likes and reposts for wall posts. For now remain a little bit for done with it.
Merge branch 'master' of C:\Users\admin\Documents\GitHub\Typical_IF6 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/src/main/AndroidManifest.xml
	app/src/main/java/typical_if/android/Constants.java
	app/src/main/java/typical_if/android/VKHelper.java
	app/src/main/java/typical_if/android/activity/SplashActivity.java
	app/src/main/java/typical_if/android/adapter/CommentsListAdapter.java
	app/src/main/java/typical_if/android/adapter/FullScreenImageAdapter.java
	app/src/main/java/typical_if/android/adapter/WallAdapter.java
	app/src/main/java/typical_if/android/fragment/FragmentFullScreenImagePhotoViewer.java
	app/src/main/java/typical_if/android/fragment/FragmentPhotoCommentAndInfo.java
	app/src/main/java/typical_if/android/fragment/FragmentPhotoList.java
	app/src/main/java/typical_if/android/fragment/FragmentWall.java
	app/src/main/java/typical_if/android/model/Photo.java
	app/src/main/java/typical_if/android/view/TouchImageView.java
	app/src/main/res/layout/comment_list_item.xml
	app/src/main/res/layout/fragment_photo_list_item.xml
The fixing has already done ! I've finished over "likes" and "comments" for photos, started work on likes and reposts for wall posts. For now remain a little bit for done with it.