Photo timelapse UI dialog
Merge branch 'master' into photo_timelapse
Merge branch 'master' into photo_timelapse

Conflicts:
	src/com/almalence/opencam/PluginManager.java
	src/com/almalence/plugins/capture/standard/CapturePlugin.java
Merge branch 'master' into photo_timelapse

Conflicts:
	src/com/almalence/opencam/PluginManager.java
	src/com/almalence/opencam/ui/SelfTimer.java
	src/com/almalence/plugins/capture/standard/CapturePlugin.java
Photo timelapse logic
Merge branch 'master' into photo_timelapse
cleanup
Merge branch 'master' into photo_timelapse

Conflicts:
	src/com/almalence/opencam/PluginManager.java
	src/com/almalence/opencam/ui/SelfTimer.java
	src/com/almalence/plugins/capture/standard/CapturePlugin.java
Photo timelapse
Merge branch 'master' into photo_timelapse
Photo time lapse merge