Merge jcodec/master

Conflicts:
	My Documents/NetBeansProjects/G729/src/app/Main.java
Merge jcodec/master

Conflicts:
	My Documents/NetBeansProjects/G729/src/app/Main.java