tes commit

semoga ga ada yang jadi rusak gara2 gue.. ._.
Merge branch 'master' of https://github.com/fatkhank/ppla03

Conflicts:
	android/AndroidManifest.xml
	android/res/drawable-mdpi/ic_action_download.png
	android/res/drawable-mdpi/ic_action_group.png
	android/res/drawable-mdpi/ic_action_overflow.png
	android/res/drawable-mdpi/ic_action_paste.png
	android/res/drawable-mdpi/ic_action_share.png
	android/res/drawable-mdpi/ic_action_undo.png
	android/res/layout/acivity_loader.xml
	android/res/layout/activity_list.xml
	android/res/layout/activity_tester.xml
	android/res/layout/dialog_export.xml
	android/res/values/colors.xml
	android/res/values/dimens.xml
	android/res/values/strings.xml
	android/src/com/ppla03/collapaint/CanvasExporter.java
	android/src/com/ppla03/collapaint/CanvasListener.java
	android/src/com/ppla03/collapaint/CanvasSynchronizer.java
	android/src/com/ppla03/collapaint/CanvasView.java
	android/src/com/ppla03/collapaint/CollaUserManager.java
	android/src/com/ppla03/collapaint/FontManager.java
	android/src/com/ppla03/collapaint/conn/BrowserConnector.java
	android/src/com/ppla03/collapaint/conn/CanvasConnector.java
	android/src/com/ppla03/collapaint/conn/CanvasCreationListener.java
	android/src/com/ppla03/collapaint/conn/ManageParticipantListener.java
	android/src/com/ppla03/collapaint/conn/ParticipantManager.java
	android/src/com/ppla03/collapaint/conn/ServerConnector.java
	android/src/com/ppla03/collapaint/conn/SyncEventListener.java
	android/src/com/ppla03/collapaint/model/CanvasModel.java
	android/src/com/ppla03/collapaint/model/UserModel.java
	android/src/com/ppla03/collapaint/model/action/DeleteAction.java
	android/src/com/ppla03/collapaint/model/action/DrawAction.java
	android/src/com/ppla03/collapaint/model/action/DrawMultiple.java
	android/src/com/ppla03/collapaint/model/action/GeomAction.java
	android/src/com/ppla03/collapaint/model/action/MoveMultiple.java
	android/src/com/ppla03/collapaint/model/action/ReshapeAction.java
	android/src/com/ppla03/collapaint/model/action/StyleAction.java
	android/src/com/ppla03/collapaint/model/action/TransformAction.java
	android/src/com/ppla03/collapaint/model/action/UserAction.java
	android/src/com/ppla03/collapaint/model/object/BasicObject.java
	android/src/com/ppla03/collapaint/model/object/BoxHandler.java
	android/src/com/ppla03/collapaint/model/object/CanvasObject.java
	android/src/com/ppla03/collapaint/model/object/ControlPoint.java
	android/src/com/ppla03/collapaint/model/object/FreeObject.java
	android/src/com/ppla03/collapaint/model/object/Joint.java
	android/src/com/ppla03/collapaint/model/object/LineObject.java
	android/src/com/ppla03/collapaint/model/object/Mover.java
	android/src/com/ppla03/collapaint/model/object/ObjectClipboard.java
	android/src/com/ppla03/collapaint/model/object/OvalObject.java
	android/src/com/ppla03/collapaint/model/object/PolygonObject.java
	android/src/com/ppla03/collapaint/model/object/RectObject.java
	android/src/com/ppla03/collapaint/model/object/Rotator.java
	android/src/com/ppla03/collapaint/model/object/ShapeHandler.java
	android/src/com/ppla03/collapaint/model/object/TextObject.java
	android/src/com/ppla03/collapaint/ui/BrowserActivity.java
	android/src/com/ppla03/collapaint/ui/ColorPane.java
	android/src/com/ppla03/collapaint/ui/ColorView.java
	android/src/com/ppla03/collapaint/ui/LoaderActivity.java
	android/src/com/ppla03/collapaint/ui/TesterActivity.java
	android/src/com/ppla03/collapaint/ui/WorkspaceActivity.java
	server/src/java/collapaint/DB.java
	server/src/java/collapaint/auth/User.java
	server/src/java/collapaint/canvas/Create.java
	server/src/java/collapaint/canvas/List.java
	server/src/java/collapaint/canvas/Open.java
	server/src/java/collapaint/canvas/Participants.java
	server/src/java/collapaint/transact/Action.java